summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-29 14:00:57 -0400
committerScott Dodson <sdodson@redhat.com>2016-07-29 16:09:53 -0400
commitc244dd767f1185fd0b3da9c32f639aab91489c0e (patch)
tree05123317f64083a01724fe27aa7ba9088469a9aa /roles/openshift_examples/tasks
parent3391066d5b5c5a981ee6f0a375b55bd94d42c7fd (diff)
downloadopenshift-c244dd767f1185fd0b3da9c32f639aab91489c0e.tar.gz
openshift-c244dd767f1185fd0b3da9c32f639aab91489c0e.tar.bz2
openshift-c244dd767f1185fd0b3da9c32f639aab91489c0e.tar.xz
openshift-c244dd767f1185fd0b3da9c32f639aab91489c0e.zip
Fix xpaas_templates_base
Diffstat (limited to 'roles/openshift_examples/tasks')
-rw-r--r--roles/openshift_examples/tasks/main.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_examples/tasks/main.yml b/roles/openshift_examples/tasks/main.yml
index 86148784f..4150fabec 100644
--- a/roles/openshift_examples/tasks/main.yml
+++ b/roles/openshift_examples/tasks/main.yml
@@ -102,12 +102,15 @@
path: "{{ item }}"
state: absent
with_items:
- - "{{ xpaas_templates }}/sso70-basic.json"
+ - "{{ xpaas_templates_base }}/sso70-basic.json"
- name: Remove old xPaas templates from openshift namespace
- command: oc delete -n openshift {{ item }}
+ command: "{{ openshift.common.client_binary }} -n openshift delete templates/{{ item }}"
with_items:
- sso70-basic
+ register: oex_delete_old_xpaas_templates
+ failed_when: "'not found' not in oex_delete_old_xpaas_templates.stderr and oex_delete_old_xpaas_templates.rc != 0"
+ changed_when: false
- name: Import xPaas image streams
command: >