Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

We need to just fix re-entering a role rather than commenting it out

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2017-11-29 12:03:17 +00:00
parent 100c857bf2
commit 2880217bcb
1 changed files with 29 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

60
playbooks/openshift-apps/waiverdb.yml
View file

@ -19,37 +19,35 @@
- mjia - mjia
- dcallagh - dcallagh
- { role: openshift/object, app: waiverdb, template: secret.yml } - { role: openshift/object, app: waiverdb, template: secret.yml }
#- { role: openshift/secret-file - role: openshift/secret-file
# , app: waiverdb app: waiverdb
# , secret_name: waiverdb-stg-secret secret_name: waiverdb-stg-secret
# , key: client_secrets.json key: client_secrets.json
# , template: client_secrets.json template: client_secrets.json
# } - role: openshift/secret-file
# These secret roles also break if the secret already exists. Can only be run once. app: waiverdb
#- role: openshift/secret-file secret_name: waiverdb-fedmsg-key
# app: waiverdb key: fedmsg-waiverdb.key
# secret_name: waiverdb-fedmsg-key privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.key
# key: fedmsg-waiverdb.key when: env == "staging"
# privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.key - role: openshift/secret-file
# when: env == "staging" app: waiverdb
#- role: openshift/secret-file secret_name: waiverdb-fedmsg-crt
# app: waiverdb key: fedmsg-waiverdb.crt
# secret_name: waiverdb-fedmsg-crt privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.crt
# key: fedmsg-waiverdb.crt when: env == "staging"
# privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.stg.fedoraproject.org.crt - role: openshift/secret-file
# when: env == "staging" app: waiverdb
#- role: openshift/secret-file secret_name: waiverdb-fedmsg-key
# app: waiverdb key: fedmsg-waiverdb.key
# secret_name: waiverdb-fedmsg-key privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.key
# key: fedmsg-waiverdb.key when: env != "staging"
# privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.key - role: openshift/secret-file
# when: env != "staging" app: waiverdb
#- role: openshift/secret-file secret_name: waiverdb-fedmsg-crt
# app: waiverdb key: fedmsg-waiverdb.crt
# secret_name: waiverdb-fedmsg-crt privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.crt
# key: fedmsg-waiverdb.crt when: env != "staging"
# 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: imagestream.yml }
- { role: openshift/object, app: waiverdb, file: buildconfig.yml } - { role: openshift/object, app: waiverdb, file: buildconfig.yml }
- { role: openshift/object, app: waiverdb, template: configmap.yml } - { role: openshift/object, app: waiverdb, template: configmap.yml }