Playbook Consolidation - openshift-master

playbooks/aws/openshift-cluster/install.yml

@@ -33,10 +33,10 @@
   when: groups.oo_lb_to_config | default([]) | count > 0
 
 - name: include openshift-master config
-  include: ../../common/openshift-master/config.yml
+  include: ../../openshift-master/private/config.yml
 
 - name: include master additional config
-  include: ../../common/openshift-master/additional_config.yml
+  include: ../../openshift-master/private/additional_config.yml
 
 - name: include master additional config
   include: ../../openshift-node/private/config.yml

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

@@ -13,7 +13,7 @@
 
 - include: ../../common/openshift-cluster/redeploy-certificates/masters-backup.yml
 
-- include: ../../common/openshift-master/certificates.yml
+- include: ../../openshift-master/private/certificates.yml
   vars:
     openshift_certificates_redeploy: true
 
@@ -27,7 +27,7 @@
   vars:
     g_etcd_certificates_expired: "{{ ('expired' in (hostvars | oo_select_keys(groups['etcd']) | oo_collect('check_results.check_results.etcd') | oo_collect('health'))) | bool }}"
 
-- include: ../../common/openshift-master/restart.yml
+- include: ../../openshift-master/private/restart.yml
 
 - include: ../../openshift-node/private/restart.yml
 
@@ -37,6 +37,6 @@
 - include: ../../common/openshift-cluster/redeploy-certificates/registry.yml
   when: openshift_hosted_manage_registry | default(true) | bool
 
-- include: ../../common/openshift-master/revert-client-ca.yml
+- include: ../../openshift-master/private/revert-client-ca.yml
 
-- include: ../../common/openshift-master/restart.yml
+- include: ../../openshift-master/private/restart.yml

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

@@ -15,4 +15,4 @@
   vars:
     g_etcd_certificates_expired: "{{ ('expired' in (hostvars | oo_select_keys(groups['etcd']) | oo_collect('check_results.check_results.etcd') | oo_collect('health'))) | bool }}"
 
-- include: ../../common/openshift-master/restart.yml
+- include: ../../openshift-master/private/restart.yml

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

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

playbooks/byo/openshift-master/additional_config.yml

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

playbooks/byo/openshift-master/certificates.yml

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

playbooks/byo/openshift-master/config.yml

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

playbooks/byo/openshift-master/filter_plugins

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

playbooks/byo/openshift-master/lookup_plugins

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

playbooks/byo/openshift-master/restart.yml

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

playbooks/byo/openshift-master/roles

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

playbooks/common/openshift-cluster/config.yml

@@ -9,9 +9,9 @@
 - include: ../../openshift-loadbalancer/private/config.yml
   when: groups.oo_lb_to_config | default([]) | count > 0
 
-- include: ../openshift-master/config.yml
+- include: ../../openshift-master/private/config.yml
 
-- include: ../openshift-master/additional_config.yml
+- include: ../../openshift-master/private/additional_config.yml
 
 - include: ../../openshift-node/private/config.yml
 

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

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

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

@@ -207,7 +207,7 @@
       group: "{{ 'root' if item == 'root' else _ansible_ssh_user_gid.stdout  }}"
     with_items: "{{ client_users }}"
 
-- include: ../../openshift-master/restart.yml
+- include: ../../../openshift-master/private/restart.yml
   # Do not restart masters when master or etcd certificates were previously expired.
   when:
   # masters

playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml

@@ -85,10 +85,10 @@
   - include: "{{ openshift_master_upgrade_hook }}"
     when: openshift_master_upgrade_hook is defined
 
-  - include: ../../openshift-master/restart_hosts.yml
+  - include: ../../../openshift-master/private/restart_hosts.yml
     when: openshift.common.rolling_restart_mode == 'system'
 
-  - include: ../../openshift-master/restart_services.yml
+  - include: ../../../openshift-master/private/restart_services.yml
     when: openshift.common.rolling_restart_mode == 'services'
 
   # Run the post-upgrade hook if defined:

playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml

@@ -79,7 +79,7 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../../../openshift-master/validate_restart.yml
+- include: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml

@@ -83,7 +83,7 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../../../openshift-master/validate_restart.yml
+- include: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml

@@ -83,7 +83,7 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../../../openshift-master/validate_restart.yml
+- include: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml

@@ -87,7 +87,7 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../../../openshift-master/validate_restart.yml
+- include: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_8/upgrade.yml

@@ -83,7 +83,7 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../../../openshift-master/validate_restart.yml
+- include: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_8/upgrade_control_plane.yml

@@ -87,7 +87,7 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../../../openshift-master/validate_restart.yml
+- include: ../../../../openshift-master/private/validate_restart.yml
   tags:
   - pre_upgrade
 

playbooks/openshift-master/additional_config.yml

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

playbooks/openshift-master/certificates.yml

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

playbooks/openshift-master/config.yml

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

playbooks/common/openshift-master/scaleup.yml

@@ -44,11 +44,11 @@
     delay: 1
     changed_when: false
 
-- include: ../openshift-master/set_network_facts.yml
+- include: set_network_facts.yml
 
 - include: ../../openshift-etcd/private/certificates.yml
 
-- include: ../openshift-master/config.yml
+- include: config.yml
 
 - include: ../../openshift-loadbalancer/private/config.yml
 

playbooks/openshift-master/restart.yml

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

playbooks/byo/openshift-master/scaleup.yml

@@ -1,5 +1,5 @@
 ---
-- include: ../../init/evaluate_groups.yml
+- include: ../init/evaluate_groups.yml
 
 - name: Ensure there are new_masters or new_nodes
   hosts: localhost
@@ -18,6 +18,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-master/scaleup.yml
+- include: private/scaleup.yml

roles/installer_checkpoint/README.md

@@ -160,7 +160,7 @@ Health Check               : Complete (0:01:10)
 etcd Install               : Complete (0:02:58)
 Master Install             : Complete (0:09:20)
 Master Additional Install  : In Progress (0:20:04)
-    This phase can be restarted by running: playbooks/byo/openshift-master/additional_config.yml
+    This phase can be restarted by running: playbooks/openshift-master/additional_config.yml
 ```
 
 [set_stats]: http://docs.ansible.com/ansible/latest/set_stats_module.html

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -62,11 +62,11 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_master': {
                 'title': 'Master Install',
-                'playbook': 'playbooks/byo/openshift-master/config.yml'
+                'playbook': 'playbooks/openshift-master/config.yml'
             },
             'installer_phase_master_additional': {
                 'title': 'Master Additional Install',
-                'playbook': 'playbooks/byo/openshift-master/additional_config.yml'
+                'playbook': 'playbooks/openshift-master/additional_config.yml'
             },
             'installer_phase_node': {
                 'title': 'Node Install',