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

Playbook Consolidation - openshift-glusterfs

playbooks/aws/openshift-cluster/install.yml

@@ -42,5 +42,5 @@
   include: ../../openshift-node/private/config.yml
 
 - name: include openshift-glusterfs
-  include: ../../common/openshift-glusterfs/config.yml
+  include: ../../openshift-glusterfs/private/config.yml
   when: groups.oo_glusterfs_to_config | default([]) | count > 0

playbooks/byo/openshift-glusterfs/config.yml

@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-glusterfs/config.yml

playbooks/byo/openshift-glusterfs/filter_plugins

@@ -1 +0,0 @@
-../../../filter_plugins

playbooks/byo/openshift-glusterfs/lookup_plugins

@@ -1 +0,0 @@
-../../../lookup_plugins

playbooks/byo/openshift-glusterfs/registry.yml

@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-glusterfs/registry.yml

playbooks/byo/openshift-glusterfs/roles

@@ -1 +0,0 @@
-../../../roles

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

playbooks/openshift-glusterfs/config.yml

@@ -0,0 +1,4 @@
+---
+- include: ../init/main.yml
+
+- include: private/config.yml

playbooks/openshift-glusterfs/registry.yml

@@ -0,0 +1,4 @@
+---
+- include: ../init/main.yml
+
+- include: private/registry.yml