From cd0cd7fe5e2f79099ad65082142bfc366d8acc46 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Wed, 17 Jan 2018 18:44:57 +0000
Subject: [PATCH] puiterwijk gave us a workaround in
 8dcf3d2faa3cf92aac09a99499adfcfa6314ed69

---
 playbooks/openshift-apps/greenwave.yml | 49 +++++++++++++-------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml
index 81adc00f35..687ca7dfb4 100644
--- a/playbooks/openshift-apps/greenwave.yml
+++ b/playbooks/openshift-apps/greenwave.yml
@@ -17,31 +17,30 @@
     appowners:
     - mjia
     - dcallagh
-  # These secret roles also break if the secret already exists.  Can only be run once.
-  #- role: openshift/secret-file
-  #  app: greenwave
-  #  secret_name: greenwave-fedmsg-key
-  #  key: fedmsg-greenwave.key
-  #  privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.stg.fedoraproject.org.key
-  #  when: env == "staging"
-  #- role: openshift/secret-file
-  #  app: greenwave
-  #  secret_name: greenwave-fedmsg-crt
-  #  key: fedmsg-greenwave.crt
-  #  privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.stg.fedoraproject.org.crt
-  #  when: env == "staging"
-  #- role: openshift/secret-file
-  #  app: greenwave
-  #  secret_name: greenwave-fedmsg-key
-  #  key: fedmsg-greenwave.key
-  #  privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.key
-  #  when: env != "staging"
-  #- role: openshift/secret-file
-  #  app: greenwave
-  #  secret_name: greenwave-fedmsg-crt
-  #  key: fedmsg-greenwave.crt
-  #  privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.crt
-  #  when: env != "staging"
+  - role: openshift/secret-file
+    app: greenwave
+    secret_name: greenwave-fedmsg-key
+    key: fedmsg-greenwave.key
+    privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.stg.fedoraproject.org.key
+    when: env == "staging"
+  - role: openshift/secret-file
+    app: greenwave
+    secret_name: greenwave-fedmsg-crt
+    key: fedmsg-greenwave.crt
+    privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.stg.fedoraproject.org.crt
+    when: env == "staging"
+  - role: openshift/secret-file
+    app: greenwave
+    secret_name: greenwave-fedmsg-key
+    key: fedmsg-greenwave.key
+    privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.key
+    when: env != "staging"
+  - role: openshift/secret-file
+    app: greenwave
+    secret_name: greenwave-fedmsg-crt
+    key: fedmsg-greenwave.crt
+    privatefile: fedmsg-certs/keys/greenwave-greenwave-web-greenwave.app.os.fedoraproject.org.crt
+    when: env != "staging"
   - { role: openshift/object, app: greenwave, file: imagestream.yml }
   - { role: openshift/object, app: greenwave, template: buildconfig.yml }
   - { role: openshift/start-build, app: greenwave, name: greenwave-docker-build }