Playbook Consolidation - openshift-loadbalancer

playbooks/aws/openshift-cluster/install.yml

@@ -29,7 +29,7 @@
   when: groups.oo_nfs_to_config | default([]) | count > 0
 
 - name: include loadbalancer
-  include: ../../common/openshift-loadbalancer/config.yml
+  include: ../../openshift-loadbalancer/private/config.yml
   when: groups.oo_lb_to_config | default([]) | count > 0
 
 - name: include openshift-master config

playbooks/byo/openshift-loadbalancer/config.yml

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

playbooks/common/openshift-cluster/config.yml

@@ -6,7 +6,7 @@
 - include: ../openshift-nfs/config.yml
   when: groups.oo_nfs_to_config | default([]) | count > 0
 
-- include: ../openshift-loadbalancer/config.yml
+- include: ../../openshift-loadbalancer/private/config.yml
   when: groups.oo_lb_to_config | default([]) | count > 0
 
 - include: ../openshift-master/config.yml

playbooks/common/openshift-loadbalancer/roles

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

playbooks/common/openshift-master/scaleup.yml

@@ -50,7 +50,7 @@
 
 - include: ../openshift-master/config.yml
 
-- include: ../openshift-loadbalancer/config.yml
+- include: ../../openshift-loadbalancer/private/config.yml
 
 - include: ../openshift-node/certificates.yml
 

playbooks/openshift-loadbalancer/config.yml

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

playbooks/openshift-loadbalancer/private/roles

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

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -58,7 +58,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_loadbalancer': {
                 'title': 'Load balancer Install',
-                'playbook': 'playbooks/byo/openshift-loadbalancer/config.yml'
+                'playbook': 'playbooks/openshift-loadbalancer/config.yml'
             },
             'installer_phase_master': {
                 'title': 'Master Install',