Merge 495f70b into 767c8e0

openshift · Oct 2, 2019 · 76b2fa6 · 76b2fa6
2 parents 767c8e0 + 495f70b
commit 76b2fa6
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_upgrade.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_upgrade.yml
@@ -95,6 +95,18 @@
     delegate_to: "{{ groups.oo_first_master.0 }}"
     failed_when: False
 
+  - name: Check GlusterFS DaemonSet status
+    oc_obj:
+      namespace: "{{ glusterfs_namespace }}"
+      kind: daemonset
+      name: glusterfs-{{ glusterfs_name }}
+      state: list
+    register: glusterfs_ds
+
+  - fail:
+      msg: Unable to delete glusterfs daemonset
+    when: glusterfs_ds.module_results.results[0].status is defined
+
   - name: Get old-style GlusterFS pods
     oc_obj:
       namespace: "{{ glusterfs_namespace }}"