Merge pull request #9780 from mgugino-upstream-stage/fix-istag-delete

Add failed_when to 'Remove the image stream tag' tasks

roles/openshift_bootstrap_autoapprover/tasks/main.yml

@@ -20,8 +20,14 @@
 # TODO: temporary until we fix apply for image stream tags
 - name: Remove the image stream tag
   command: >
-    {{ openshift_client_binary }} delete -n openshift-infra istag node:v3.11 --ignore-not-found
+    {{ openshift_client_binary }}
     --config={{ openshift.common.config_base }}/master/admin.kubeconfig
+    delete -n openshift-infra istag node:v3.11 --ignore-not-found
+  register: l_os_istag_del
+  # The istag might not be there, so we want to not fail in that case.
+  failed_when:
+    - l_os_istag_del.rc != 0
+    - "'have a resource type' not in l_os_istag_del.stderr"
 
 - name: Apply the config
   command: >

roles/openshift_node_group/tasks/sync.yml

@@ -34,8 +34,15 @@
 
 # TODO: temporary until we fix apply for image stream tags
 - name: Remove the image stream tag
-  shell: >
-    {{ openshift_client_binary }} --config={{ openshift.common.config_base }}/master/admin.kubeconfig delete -n openshift-node istag node:v3.11 --ignore-not-found
+  command: >
+    {{ openshift_client_binary }}
+    --config={{ openshift.common.config_base }}/master/admin.kubeconfig
+    delete -n openshift-node istag node:v3.11 --ignore-not-found
+  register: l_os_istag_del
+  # The istag might not be there, so we want to not fail in that case.
+  failed_when:
+    - l_os_istag_del.rc != 0
+    - "'have a resource type' not in l_os_istag_del.stderr"
 
 - name: Apply the config
   shell: >

roles/openshift_sdn/tasks/main.yml

@@ -36,8 +36,16 @@
 
 # TODO: temporary until we fix apply for image stream tags
 - name: Remove the image stream tag
-  shell: >
-    {{ openshift_client_binary }} --config={{ openshift.common.config_base }}/master/admin.kubeconfig delete -n openshift-sdn istag node:v3.11 --ignore-not-found
+  command: >
+    {{ openshift_client_binary }}
+    --config={{ openshift.common.config_base }}/master/admin.kubeconfig
+    delete -n openshift-sdn istag node:v3.11 --ignore-not-found
+  register: l_os_istag_del
+  # The istag might not be there, so we want to not fail in that case.
+  failed_when:
+    - l_os_istag_del.rc != 0
+    - "'have a resource type' not in l_os_istag_del.stderr"
+
 
 - name: Apply the config
   shell: >