瀏覽代碼

Fix xpaas_templates_base

Scott Dodson 8 年之前
父節點
當前提交
c244dd767f
共有 1 個文件被更改,包括 5 次插入2 次删除
  1. 5 2
      roles/openshift_examples/tasks/main.yml

+ 5 - 2
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: >