Merge pull request #6918 from SaravanaStorageNetwork/uninstall_playbook

Automatic merge from submit-queue.

Uninstall playbook for Glusterfs 

Uninstall playbook for Glusterfs

1 files changed, 1 insertions, 51 deletions

diff --git a/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml b/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml
index 92de1b64d..b50050956 100644
--- a/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml
+++ b/roles/openshift_storage_glusterfs/tasks/glusterfs_config.yml
@@ -1,53 +1,3 @@
 ---
-- set_fact:
-    glusterfs_timeout: "{{ openshift_storage_glusterfs_timeout }}"
-    glusterfs_namespace: "{{ openshift_storage_glusterfs_namespace }}"
-    glusterfs_is_native: "{{ openshift_storage_glusterfs_is_native | bool }}"
-    glusterfs_name: "{{ openshift_storage_glusterfs_name }}"
-    # map_from_pairs is a custom filter plugin in role lib_utils
-    glusterfs_nodeselector: "{{ openshift_storage_glusterfs_nodeselector | default(['storagenode', openshift_storage_glusterfs_name] | join('=')) | map_from_pairs }}"
-    glusterfs_use_default_selector: "{{ openshift_storage_glusterfs_use_default_selector }}"
-    glusterfs_storageclass: "{{ openshift_storage_glusterfs_storageclass }}"
-    glusterfs_storageclass_default: "{{ openshift_storage_glusterfs_storageclass_default | bool }}"
-    glusterfs_image: "{{ openshift_storage_glusterfs_image }}"
-    glusterfs_version: "{{ openshift_storage_glusterfs_version }}"
-    glusterfs_block_deploy: "{{ openshift_storage_glusterfs_block_deploy | bool }}"
-    glusterfs_block_image: "{{ openshift_storage_glusterfs_block_image }}"
-    glusterfs_block_version: "{{ openshift_storage_glusterfs_block_version }}"
-    glusterfs_block_host_vol_create: "{{ openshift_storage_glusterfs_block_host_vol_create }}"
-    glusterfs_block_host_vol_size: "{{ openshift_storage_glusterfs_block_host_vol_size }}"
-    glusterfs_block_host_vol_max: "{{ openshift_storage_glusterfs_block_host_vol_max }}"
-    glusterfs_block_storageclass: "{{ openshift_storage_glusterfs_block_storageclass | bool }}"
-    glusterfs_block_storageclass_default: "{{ openshift_storage_glusterfs_block_storageclass_default | bool }}"
-    glusterfs_s3_deploy: "{{ openshift_storage_glusterfs_s3_deploy | bool }}"
-    glusterfs_s3_image: "{{ openshift_storage_glusterfs_s3_image }}"
-    glusterfs_s3_version: "{{ openshift_storage_glusterfs_s3_version }}"
-    glusterfs_s3_account: "{{ openshift_storage_glusterfs_s3_account }}"
-    glusterfs_s3_user: "{{ openshift_storage_glusterfs_s3_user }}"
-    glusterfs_s3_password: "{{ openshift_storage_glusterfs_s3_password }}"
-    glusterfs_s3_pvc: "{{ openshift_storage_glusterfs_s3_pvc }}"
-    glusterfs_s3_pvc_size: "{{ openshift_storage_glusterfs_s3_pvc_size }}"
-    glusterfs_s3_meta_pvc: "{{ openshift_storage_glusterfs_s3_meta_pvc }}"
-    glusterfs_s3_meta_pvc_size: "{{ openshift_storage_glusterfs_s3_meta_pvc_size }}"
-    glusterfs_wipe: "{{ openshift_storage_glusterfs_wipe | bool }}"
-    glusterfs_heketi_is_native: "{{ openshift_storage_glusterfs_heketi_is_native | bool }}"
-    glusterfs_heketi_is_missing: "{{ openshift_storage_glusterfs_heketi_is_missing | bool }}"
-    glusterfs_heketi_deploy_is_missing: "{{ openshift_storage_glusterfs_heketi_deploy_is_missing | bool }}"
-    glusterfs_heketi_cli: "{{ openshift_storage_glusterfs_heketi_cli }}"
-    glusterfs_heketi_image: "{{ openshift_storage_glusterfs_heketi_image }}"
-    glusterfs_heketi_version: "{{ openshift_storage_glusterfs_heketi_version }}"
-    glusterfs_heketi_admin_key: "{{ openshift_storage_glusterfs_heketi_admin_key }}"
-    glusterfs_heketi_user_key: "{{ openshift_storage_glusterfs_heketi_user_key }}"
-    glusterfs_heketi_topology_load: "{{ openshift_storage_glusterfs_heketi_topology_load | bool }}"
-    glusterfs_heketi_wipe: "{{ openshift_storage_glusterfs_heketi_wipe | bool }}"
-    glusterfs_heketi_url: "{{ openshift_storage_glusterfs_heketi_url }}"
-    glusterfs_heketi_port: "{{ openshift_storage_glusterfs_heketi_port }}"
-    glusterfs_heketi_executor: "{{ openshift_storage_glusterfs_heketi_executor }}"
-    glusterfs_heketi_ssh_port: "{{ openshift_storage_glusterfs_heketi_ssh_port }}"
-    glusterfs_heketi_ssh_user: "{{ openshift_storage_glusterfs_heketi_ssh_user }}"
-    glusterfs_heketi_ssh_sudo: "{{ openshift_storage_glusterfs_heketi_ssh_sudo | bool }}"
-    glusterfs_heketi_ssh_keyfile: "{{ openshift_storage_glusterfs_heketi_ssh_keyfile }}"
-    glusterfs_heketi_fstab: "{{ openshift_storage_glusterfs_heketi_fstab }}"
-    glusterfs_nodes: "{{ groups.glusterfs | default([]) }}"
-
+- include_tasks: glusterfs_config_facts.yml
 - include_tasks: glusterfs_common.yml