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

Revert the change to openshift/object to use file as originally

Browse source 
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2018-04-12 23:40:49 +02:00
parent bb5b4da3c0
commit 9aa7b62166
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,11 +49,11 @@
key: fedmsg-waiverdb.crt
privatefile: fedmsg-certs/keys/waiverdb-waiverdb-web-waiverdb.app.os.fedoraproject.org.crt
when: env != "staging"
- { role: openshift/object, vars: {app: waiverdb, filename: imagestream.yml }}
- { role: openshift/object, vars: {app: waiverdb, filename: buildconfig.yml }}
- { role: openshift/object, vars: {app: waiverdb, file: imagestream.yml }}
- { role: openshift/object, vars: {app: waiverdb, file: buildconfig.yml }}
- { role: openshift/start-build, vars: {app: waiverdb, name: waiverdb-docker-build }}
- { role: openshift/object, vars: {app: waiverdb, template: configmap.yml }}
- { role: openshift/object, vars: {app: waiverdb, filename: service.yml }}
- { role: openshift/object, vars: {app: waiverdb, filename: route.yml }}
- { role: openshift/object, vars: {app: waiverdb, file: service.yml }}
- { role: openshift/object, vars: {app: waiverdb, file: route.yml }}
- { role: openshift/object, vars: {app: waiverdb, template: deploymentconfig.yml }}
- { role: openshift/rollout, vars: {app: waiverdb, name: waiverdb-web }}

2
roles/openshift/object/tasks/main.yml
View file

@ -15,7 +15,7 @@
- name: Copy file {{filename}} to temporary file ({{tmpfile.path}})
copy: src={{roles_path}}/openshift-apps/{{app}}/files/{{filename}} dest={{tmpfile.path}}
when: filename is defined
when: file is defined
run_once: true
- name: Call `oc apply` on the copied file