From c244dd767f1185fd0b3da9c32f639aab91489c0e Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Fri, 29 Jul 2016 14:00:57 -0400
Subject: Fix xpaas_templates_base

---
 roles/openshift_examples/tasks/main.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'roles/openshift_examples/tasks')

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: >
-- 
cgit v1.2.3