From 2880217bcb96db85660f95f73fb85cf07136b627 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Wed, 29 Nov 2017 12:03:17 +0000
Subject: [PATCH] We need to just fix re-entering a role rather than commenting
 it out

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 playbooks/openshift-apps/waiverdb.yml | 60 +++++++++++++--------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml
index cc9e033147..b18f39865c 100644
--- a/playbooks/openshift-apps/waiverdb.yml
+++ b/playbooks/openshift-apps/waiverdb.yml
@@ -19,37 +19,35 @@
     - mjia
     - dcallagh
   - { role: openshift/object, app: waiverdb, template: secret.yml }
-  #- { role: openshift/secret-file
-  #  , app: waiverdb
-  #  , secret_name: waiverdb-stg-secret
-  #  , key: client_secrets.json
-  #  , template: client_secrets.json
-  #  }
-  # These secret roles also break if the secret already exists.  Can only be run once.
-  #- role: openshift/secret-file
-  #  app: waiverdb
-  #  secret_name: waiverdb-fedmsg-key
-  #  key: fedmsg-waiverdb.key
-  #  privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.key
-  #  when: env == "staging"
-  #- role: openshift/secret-file
-  #  app: waiverdb
-  #  secret_name: waiverdb-fedmsg-crt
-  #  key: fedmsg-waiverdb.crt
-  #  privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.crt
-  #  when: env == "staging"
-  #- role: openshift/secret-file
-  #  app: waiverdb
-  #  secret_name: waiverdb-fedmsg-key
-  #  key: fedmsg-waiverdb.key
-  #  privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.key
-  #  when: env != "staging"
-  #- role: openshift/secret-file
-  #  app: waiverdb
-  #  secret_name: waiverdb-fedmsg-crt
-  #  key: fedmsg-waiverdb.crt
-  #  privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.crt
-  #  when: env != "staging"
+  - role: openshift/secret-file
+    app: waiverdb
+    secret_name: waiverdb-stg-secret
+    key: client_secrets.json
+    template: client_secrets.json
+  - role: openshift/secret-file
+    app: waiverdb
+    secret_name: waiverdb-fedmsg-key
+    key: fedmsg-waiverdb.key
+    privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.key
+    when: env == "staging"
+  - role: openshift/secret-file
+    app: waiverdb
+    secret_name: waiverdb-fedmsg-crt
+    key: fedmsg-waiverdb.crt
+    privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.crt
+    when: env == "staging"
+  - role: openshift/secret-file
+    app: waiverdb
+    secret_name: waiverdb-fedmsg-key
+    key: fedmsg-waiverdb.key
+    privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.key
+    when: env != "staging"
+  - role: openshift/secret-file
+    app: waiverdb
+    secret_name: waiverdb-fedmsg-crt
+    key: fedmsg-waiverdb.crt
+    privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.crt
+    when: env != "staging"
   - { role: openshift/object, app: waiverdb, file: imagestream.yml }
   - { role: openshift/object, app: waiverdb, file: buildconfig.yml }
   - { role: openshift/object, app: waiverdb, template: configmap.yml }