Playbook Consolidation - openshift-node

playbooks/aws/openshift-cluster/build_ami.yml

@@ -33,7 +33,7 @@
 
 # This is the part that installs all of the software and configs for the instance
 # to become a node.
-- include: ../../common/openshift-node/image_prep.yml
+- include: ../../openshift-node/private/image_prep.yml
 
 - include: seal_ami.yml
   vars:

playbooks/aws/openshift-cluster/install.yml

@@ -39,7 +39,7 @@
   include: ../../common/openshift-master/additional_config.yml
 
 - name: include master additional config
-  include: ../../common/openshift-node/config.yml
+  include: ../../openshift-node/private/config.yml
 
 - name: include openshift-glusterfs
   include: ../../common/openshift-glusterfs/config.yml

playbooks/byo/openshift-cluster/redeploy-certificates.yml

@@ -19,7 +19,7 @@
 
 - include: ../../common/openshift-cluster/redeploy-certificates/nodes-backup.yml
 
-- include: ../../common/openshift-node/certificates.yml
+- include: ../../openshift-node/private/certificates.yml
   vars:
     openshift_certificates_redeploy: true
 
@@ -29,7 +29,7 @@
 
 - include: ../../common/openshift-master/restart.yml
 
-- include: ../../common/openshift-node/restart.yml
+- include: ../../openshift-node/private/restart.yml
 
 - include: ../../common/openshift-cluster/redeploy-certificates/router.yml
   when: openshift_hosted_manage_router | default(true) | bool

playbooks/byo/openshift-cluster/redeploy-node-certificates.yml

@@ -3,8 +3,8 @@
 
 - include: ../../common/openshift-cluster/redeploy-certificates/nodes-backup.yml
 
-- include: ../../common/openshift-node/certificates.yml
+- include: ../../openshift-node/private/certificates.yml
   vars:
     openshift_certificates_redeploy: true
 
-- include: ../../common/openshift-node/restart.yml
+- include: ../../openshift-node/private/restart.yml

playbooks/byo/openshift-node/certificates.yml

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

playbooks/byo/openshift-node/config.yml

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

playbooks/byo/openshift-node/filter_plugins

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

playbooks/byo/openshift-node/lookup_plugins

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

playbooks/byo/openshift-node/network_manager.yml

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

playbooks/byo/openshift-node/restart.yml

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

playbooks/byo/openshift-node/roles

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

playbooks/common/openshift-cluster/config.yml

@@ -13,7 +13,7 @@
 
 - include: ../openshift-master/additional_config.yml
 
-- include: ../openshift-node/config.yml
+- include: ../../openshift-node/private/config.yml
 
 - include: ../openshift-glusterfs/config.yml
   when: groups.oo_glusterfs_to_config | default([]) | count > 0

playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml

@@ -272,7 +272,7 @@
       state: absent
     changed_when: false
 
-- include: ../../openshift-node/restart.yml
+- include: ../../../openshift-node/private/restart.yml
   # Do not restart nodes when node, master or etcd certificates were previously expired.
   when:
   # nodes

playbooks/common/openshift-master/scaleup.yml

@@ -52,6 +52,6 @@
 
 - include: ../openshift-loadbalancer/config.yml
 
-- include: ../openshift-node/certificates.yml
+- include: ../../openshift-node/private/certificates.yml
 
-- include: ../openshift-node/config.yml
+- include: ../../openshift-node/private/config.yml

playbooks/openshift-node/certificates.yml

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

playbooks/openshift-node/config.yml

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

playbooks/openshift-node/network_manager.yml

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

playbooks/openshift-node/restart.yml

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

playbooks/byo/openshift-node/scaleup.yml

@@ -1,5 +1,5 @@
 ---
-- include: ../../init/evaluate_groups.yml
+- include: ../init/evaluate_groups.yml
 
 - name: Ensure there are new_nodes
   hosts: localhost
@@ -16,6 +16,6 @@
 
 # Need a better way to do the above check for node without
 # running evaluate_groups and init/main.yml
-- include: ../../init/main.yml
+- include: ../init/main.yml
 
-- include: ../../common/openshift-node/config.yml
+- include: private/config.yml

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -70,7 +70,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_node': {
                 'title': 'Node Install',
-                'playbook': 'playbooks/byo/openshift-node/config.yml'
+                'playbook': 'playbooks/openshift-node/config.yml'
             },
             'installer_phase_glusterfs': {
                 'title': 'GlusterFS Install',

utils/src/ooinstall/openshift_ansible.py

@@ -281,7 +281,7 @@ def run_main_playbook(inventory_file, hosts, hosts_to_run_on, verbose=False):
     global CFG
     if len(hosts_to_run_on) != len(hosts):
         main_playbook_path = os.path.join(CFG.ansible_playbook_directory,
-                                          'playbooks/byo/openshift-node/scaleup.yml')
+                                          'playbooks/openshift-node/scaleup.yml')
     else:
         main_playbook_path = os.path.join(CFG.ansible_playbook_directory,
                                           'playbooks/byo/openshift-cluster/config.yml')