Playbook Consolidation - openshift-etcd

playbooks/aws/openshift-cluster/install.yml

@@ -22,7 +22,7 @@
   include: ../../common/openshift-checks/install.yml
 
 - name: etcd install
-  include: ../../common/openshift-etcd/config.yml
+  include: ../../openshift-etcd/private/config.yml
 
 - name: include nfs
   include: ../../common/openshift-nfs/config.yml

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

@@ -7,7 +7,7 @@
 
 - include: ../../common/openshift-cluster/redeploy-certificates/etcd-backup.yml
 
-- include: ../../common/openshift-etcd/certificates.yml
+- include: ../../openshift-etcd/private/certificates.yml
   vars:
     etcd_certificates_redeploy: true
 
@@ -23,7 +23,7 @@
   vars:
     openshift_certificates_redeploy: true
 
-- include: ../../common/openshift-etcd/restart.yml
+- include: ../../openshift-etcd/private/restart.yml
   vars:
     g_etcd_certificates_expired: "{{ ('expired' in (hostvars | oo_select_keys(groups['etcd']) | oo_collect('check_results.check_results.etcd') | oo_collect('health'))) | bool }}"
 

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

@@ -7,11 +7,11 @@
 
 - include: ../../common/openshift-cluster/redeploy-certificates/etcd-backup.yml
 
-- include: ../../common/openshift-etcd/certificates.yml
+- include: ../../openshift-etcd/private/certificates.yml
   vars:
     etcd_certificates_redeploy: true
 
-- include: ../../common/openshift-etcd/restart.yml
+- include: ../../openshift-etcd/private/restart.yml
   vars:
     g_etcd_certificates_expired: "{{ ('expired' in (hostvars | oo_select_keys(groups['etcd']) | oo_collect('check_results.check_results.etcd') | oo_collect('health'))) | bool }}"
 

playbooks/byo/openshift-etcd/certificates.yml

@@ -1,6 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-etcd/ca.yml
-
-- include: ../../common/openshift-etcd/certificates.yml

playbooks/byo/openshift-etcd/config.yml

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

playbooks/byo/openshift-etcd/embedded2external.yml

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

playbooks/byo/openshift-etcd/filter_plugins

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

playbooks/byo/openshift-etcd/lookup_plugins

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

playbooks/byo/openshift-etcd/migrate.yml

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

playbooks/byo/openshift-etcd/restart.yml

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

playbooks/byo/openshift-etcd/scaleup.yml

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

playbooks/common/openshift-cluster/config.yml

@@ -1,7 +1,7 @@
 ---
 - include: ../openshift-checks/install.yml
 
-- include: ../openshift-etcd/config.yml
+- include: ../../openshift-etcd/private/config.yml
 
 - include: ../openshift-nfs/config.yml
   when: groups.oo_nfs_to_config | default([]) | count > 0

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

@@ -21,7 +21,7 @@
       name: etcd
       tasks_from: remove_ca_certificates
 
-- include: ../../openshift-etcd/ca.yml
+- include: ../../../openshift-etcd/private/ca.yml
 
 - name: Create temp directory for syncing certs
   hosts: localhost
@@ -45,7 +45,7 @@
       etcd_sync_cert_dir: "{{ hostvars['localhost'].g_etcd_mktemp.stdout }}"
       etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
 
-- include: ../../openshift-etcd/restart.yml
+- include: ../../../openshift-etcd/private/restart.yml
   # Do not restart etcd when etcd certificates were previously expired.
   when: ('expired' not in (hostvars
                            | oo_select_keys(groups['etcd'])

playbooks/common/openshift-etcd/roles

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

playbooks/common/openshift-master/scaleup.yml

@@ -46,7 +46,7 @@
 
 - include: ../openshift-master/set_network_facts.yml
 
-- include: ../openshift-etcd/certificates.yml
+- include: ../../openshift-etcd/private/certificates.yml
 
 - include: ../openshift-master/config.yml
 

playbooks/openshift-etcd/certificates.yml

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

playbooks/openshift-etcd/config.yml

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

playbooks/openshift-etcd/embedded2external.yml

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

playbooks/openshift-etcd/migrate.yml

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

playbooks/common/openshift-etcd/embedded2external.yml

@@ -68,7 +68,7 @@
     etcd_certificates_redeploy: "{{ true }}"
 
 # 4. deploy external etcd
-- include: ../openshift-etcd/config.yml
+- include: config.yml
 
 # 5. stop external etcd
 - name: Cleanse etcd

playbooks/openshift-etcd/restart.yml

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

playbooks/openshift-etcd/scaleup.yml

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

roles/installer_checkpoint/README.md

@@ -64,7 +64,7 @@ phase are stored in the `phase_attributes` variable.
             },
             'installer_phase_etcd': {
                 'title': 'etcd Install',
-                'playbook': 'playbooks/byo/openshift-etcd/config.yml'
+                'playbook': 'playbooks/openshift-etcd/config.yml'
             },
             'installer_phase_nfs': {
                 'title': 'NFS Install',

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -50,7 +50,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_etcd': {
                 'title': 'etcd Install',
-                'playbook': 'playbooks/byo/openshift-etcd/config.yml'
+                'playbook': 'playbooks/openshift-etcd/config.yml'
             },
             'installer_phase_nfs': {
                 'title': 'NFS Install',