Add s3 and block uninstall sections as well.

Signed-off-by: Saravanakumar Arumugam <sarumuga@redhat.com>

roles/openshift_storage_glusterfs/tasks/glusterfs_uninstall.yml

@@ -94,6 +94,30 @@
   - kind: "secret"
     name: "heketi-{{ glusterfs_name }}-topology-secret"
 
+- name: Delete glusterblock provisioner resources
+  oc_obj:
+    namespace: "{{ glusterfs_namespace }}"
+    kind: "{{ item.kind }}"
+    name: "{{ item.name | default(omit) }}"
+    selector: "{{ item.selector | default(omit) }}"
+    state: absent
+  with_items:
+  - kind: "all,deploy,sa,clusterrole,clusterrolebinding"
+    selector: "glusterblock"
+  failed_when: False
+
+- name: Delete gluster-s3 resources
+  oc_obj:
+    namespace: "{{ glusterfs_namespace }}"
+    kind: "{{ item.kind }}"
+    name: "{{ item.name | default(omit) }}"
+    selector: "{{ item.selector | default(omit) }}"
+    state: absent
+  with_items:
+  - kind: "all,svc,deploy,secret,sc,pvc"
+    selector: "gluster-s3"
+  failed_when: False
+
 - name: Get GlusterFS storage devices state
   command: "pvdisplay -C --noheadings -o pv_name,vg_name {% for device in hostvars[item].glusterfs_devices %}{{ device }} {% endfor %}"
   register: devices_info