From 2679a3283a80cc1da134d30f3e2b3efbbf544e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Wed, 3 Oct 2018 08:51:00 +0000 Subject: [PATCH] messaging-bridges: fix keypair location --- playbooks/openshift-apps/messaging-bridges.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index 9e19c8e129..db851cb30a 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -20,26 +20,12 @@ app: messaging-bridges secret_name: fedmsg-key key: fedmsg-fedmsg-migration-tools.key - privatefile: fedmsg-certs/keys/messaging-bridges-stg.key - when: env == "staging" + privatefile: "fedmsg-certs/keys/fedmsg-migration-tools{{env_suffix}}.fedoraproject.org.key" - role: openshift/secret-file app: messaging-bridges secret_name: fedmsg-cert key: fedmsg-fedmsg-migration-tools.crt - privatefile: fedmsg-certs/keys/messaging-bridges-stg.crt - when: env == "staging" - - role: openshift/secret-file - app: messaging-bridges - secret_name: fedmsg-key - key: fedmsg-fedmsg-migration-tools.key - privatefile: fedmsg-certs/keys/messaging-bridges.key - when: env != "staging" - - role: openshift/secret-file - app: messaging-bridges - secret_name: fedmsg-cert - key: fedmsg-fedmsg-migration-tools.crt - privatefile: fedmsg-certs/keys/messaging-bridges.crt - when: env != "staging" + privatefile: "fedmsg-certs/keys/fedmsg-migration-tools{{env_suffix}}.fedoraproject.org.crt" - role: openshift/object app: messaging-bridges