Playbook Consolidation - openshift-management

playbooks/aws/openshift-cluster/hosted.yml

@@ -10,7 +10,7 @@
 - include: ../../common/openshift-cluster/service_catalog.yml
   when: openshift_enable_service_catalog | default(false) | bool
 
-- include: ../../common/openshift-management/config.yml
+- include: ../../openshift-management/private/config.yml
   when: openshift_management_install_management | default(false) | bool
 
 - name: Print deprecated variable warning message if necessary

playbooks/byo/openshift-management/add_container_provider.yml

@@ -1,4 +0,0 @@
----
-- include: ../../init/evaluate_groups.yml
-
-- include: ../../common/openshift-management/add_container_provider.yml

playbooks/byo/openshift-management/config.yml

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

playbooks/byo/openshift-management/roles

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

playbooks/byo/openshift-management/uninstall.yml

@@ -1,2 +0,0 @@
----
-- include: ../../common/openshift-management/uninstall.yml

playbooks/common/openshift-cluster/config.yml

@@ -29,7 +29,7 @@
 - include: service_catalog.yml
   when: openshift_enable_service_catalog | default(true) | bool
 
-- include: ../openshift-management/config.yml
+- include: ../../openshift-management/private/config.yml
   when: openshift_management_install_management | default(false) | bool
 
 - name: Print deprecated variable warning message if necessary

playbooks/openshift-management/add_container_provider.yml

@@ -0,0 +1,4 @@
+---
+- include: ../init/evaluate_groups.yml
+
+- include: private/add_container_provider.yml

playbooks/openshift-management/config.yml

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

playbooks/openshift-management/roles

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

playbooks/openshift-management/uninstall.yml

@@ -0,0 +1,2 @@
+---
+- include: private/uninstall.yml

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -98,7 +98,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_management': {
                 'title': 'Management Install',
-                'playbook': 'playbooks/byo/openshift-management/config.yml'
+                'playbook': 'playbooks/openshift-management/config.yml'
             },
         }