Merge pull request #6157 from mtnbikenc/consolidate-openshift-glusterfs

Playbook Consolidation - openshift-glusterfs

6 files changed, 1 insertions, 113 deletions

diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index c14dcd318..c01e17115 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -15,7 +15,7 @@
 
 - include: ../../openshift-node/private/config.yml
 
-- include: ../openshift-glusterfs/config.yml
+- include: ../../openshift-glusterfs/private/config.yml
   when: groups.oo_glusterfs_to_config | default([]) | count > 0
 
 - include: ../../openshift-hosted/private/config.yml
diff --git a/playbooks/common/openshift-glusterfs/config.yml b/playbooks/common/openshift-glusterfs/config.yml
deleted file mode 100644
index 19e14ab3e..000000000
--- a/playbooks/common/openshift-glusterfs/config.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- name: GlusterFS Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set GlusterFS install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_glusterfs:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: Open firewall ports for GlusterFS nodes
-  hosts: glusterfs
-  tasks:
-  - include_role:
-      name: openshift_storage_glusterfs
-      tasks_from: firewall.yml
-    when:
-    - openshift_storage_glusterfs_is_native | default(True) | bool
-  - include_role:
-      name: openshift_storage_glusterfs
-      tasks_from: kernel_modules.yml
-    when:
-    - openshift_storage_glusterfs_is_native | default(True) | bool
-
-- name: Open firewall ports for GlusterFS registry nodes
-  hosts: glusterfs_registry
-  tasks:
-  - include_role:
-      name: openshift_storage_glusterfs
-      tasks_from: firewall.yml
-    when:
-    - openshift_storage_glusterfs_registry_is_native | default(True) | bool
-  - include_role:
-      name: openshift_storage_glusterfs
-      tasks_from: kernel_modules.yml
-    when:
-    - openshift_storage_glusterfs_registry_is_native | default(True) | bool
-
-- name: Configure GlusterFS
-  hosts: oo_first_master
-  tasks:
-  - name: setup glusterfs
-    include_role:
-      name: openshift_storage_glusterfs
-    when: groups.oo_glusterfs_to_config | default([]) | count > 0
-
-- name: GlusterFS Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set GlusterFS install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_glusterfs:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/common/openshift-glusterfs/filter_plugins b/playbooks/common/openshift-glusterfs/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/common/openshift-glusterfs/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-glusterfs/lookup_plugins b/playbooks/common/openshift-glusterfs/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/common/openshift-glusterfs/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-glusterfs/registry.yml b/playbooks/common/openshift-glusterfs/registry.yml
deleted file mode 100644
index 80cf7529e..000000000
--- a/playbooks/common/openshift-glusterfs/registry.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- include: config.yml
-
-- name: Initialize GlusterFS registry PV and PVC vars
-  hosts: oo_first_master
-  tags: hosted
-  tasks:
-  - set_fact:
-      glusterfs_pv: []
-      glusterfs_pvc: []
-
-  - set_fact:
-      glusterfs_pv:
-      - name: "{{ openshift.hosted.registry.storage.volume.name }}-glusterfs-volume"
-        capacity: "{{ openshift.hosted.registry.storage.volume.size }}"
-        access_modes: "{{ openshift.hosted.registry.storage.access.modes }}"
-        storage:
-          glusterfs:
-            endpoints: "{{ openshift.hosted.registry.storage.glusterfs.endpoints }}"
-            path: "{{ openshift.hosted.registry.storage.glusterfs.path }}"
-            readOnly: "{{ openshift.hosted.registry.storage.glusterfs.readOnly }}"
-      glusterfs_pvc:
-      - name: "{{ openshift.hosted.registry.storage.volume.name }}-glusterfs-claim"
-        capacity: "{{ openshift.hosted.registry.storage.volume.size }}"
-        access_modes: "{{ openshift.hosted.registry.storage.access.modes }}"
-    when: openshift.hosted.registry.storage.glusterfs.swap
-
-- name: Create persistent volumes
-  hosts: oo_first_master
-  tags:
-  - hosted
-  vars:
-    persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups, glusterfs_pv) }}"
-    persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims(glusterfs_pvc) }}"
-  roles:
-  - role: openshift_persistent_volumes
-    when: persistent_volumes | union(glusterfs_pv) | length > 0 or persistent_volume_claims | union(glusterfs_pvc) | length > 0
-
-- name: Create Hosted Resources
-  hosts: oo_first_master
-  tags:
-  - hosted
-  pre_tasks:
-  - set_fact:
-      openshift_hosted_router_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}"
-      openshift_hosted_registry_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}"
-    when: "'master' in hostvars[groups.oo_first_master.0].openshift and 'registry_url' in hostvars[groups.oo_first_master.0].openshift.master"
-  roles:
-  - role: openshift_hosted
diff --git a/playbooks/common/openshift-glusterfs/roles b/playbooks/common/openshift-glusterfs/roles
deleted file mode 120000
index e2b799b9d..000000000
--- a/playbooks/common/openshift-glusterfs/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles/
\ No newline at end of file