Merge pull request #6365 from mtnbikenc/consolidate-etcd-upgrade

Playbook Consolidation - etcd Upgrade

21 files changed, 64 insertions, 67 deletions

diff --git a/playbooks/byo/openshift-cluster/upgrades/upgrade_etcd.yml b/playbooks/byo/openshift-cluster/upgrades/upgrade_etcd.yml
deleted file mode 100644
index a9be8dec4..000000000
--- a/playbooks/byo/openshift-cluster/upgrades/upgrade_etcd.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: ../../../init/evaluate_groups.yml
-
-- include: ../../../common/openshift-cluster/upgrades/etcd/main.yml
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/filter_plugins b/playbooks/common/openshift-cluster/upgrades/etcd/filter_plugins
deleted file mode 120000
index 27ddaa18b..000000000
--- a/playbooks/common/openshift-cluster/upgrades/etcd/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/lookup_plugins b/playbooks/common/openshift-cluster/upgrades/etcd/lookup_plugins
deleted file mode 120000
index cf407f69b..000000000
--- a/playbooks/common/openshift-cluster/upgrades/etcd/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../lookup_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/roles b/playbooks/common/openshift-cluster/upgrades/etcd/roles
deleted file mode 120000
index 6bc1a7aef..000000000
--- a/playbooks/common/openshift-cluster/upgrades/etcd/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../roles
\ No newline at end of file
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 503d75ba0..0d3fed212 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -16,8 +16,8 @@
       local_facts:
         embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
 
-- name: Upgrade and backup etcd
-  include: ./etcd/main.yml
+- name: Backup and upgrade etcd
+  include: ../../../openshift-etcd/private/upgrade_main.yml
 
 # Create service signer cert when missing. Service signer certificate
 # is added to master config in the master_config_upgrade hook.
diff --git a/playbooks/openshift-etcd/private/ca.yml b/playbooks/openshift-etcd/private/ca.yml
index c9f186e72..f3bb3c2d1 100644
--- a/playbooks/openshift-etcd/private/ca.yml
+++ b/playbooks/openshift-etcd/private/ca.yml
@@ -7,7 +7,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: ca
+      tasks_from: ca.yml
     vars:
       etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}"
       etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
diff --git a/playbooks/openshift-etcd/private/certificates-backup.yml b/playbooks/openshift-etcd/private/certificates-backup.yml
index d738c8207..ce21a1f96 100644
--- a/playbooks/openshift-etcd/private/certificates-backup.yml
+++ b/playbooks/openshift-etcd/private/certificates-backup.yml
@@ -5,10 +5,10 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: backup_generated_certificates
+      tasks_from: backup_generated_certificates.yml
   - include_role:
       name: etcd
-      tasks_from: remove_generated_certificates
+      tasks_from: remove_generated_certificates.yml
 
 - name: Backup deployed etcd certificates
   hosts: oo_etcd_to_config
@@ -16,4 +16,4 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: backup_server_certificates
+      tasks_from: backup_server_certificates.yml
diff --git a/playbooks/openshift-etcd/private/embedded2external.yml b/playbooks/openshift-etcd/private/embedded2external.yml
index 514319b88..c7a532622 100644
--- a/playbooks/openshift-etcd/private/embedded2external.yml
+++ b/playbooks/openshift-etcd/private/embedded2external.yml
@@ -20,7 +20,7 @@
   - name: Check the master API is ready
     include_role:
       name: openshift_master
-      tasks_from: check_master_api_is_ready
+      tasks_from: check_master_api_is_ready.yml
   - set_fact:
       master_service: "{{ openshift.common.service_type + '-master' }}"
       embedded_etcd_backup_suffix: "{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}"
@@ -34,7 +34,7 @@
   # Can't use with_items with include_role: https://github.com/ansible/ansible/issues/21285
   - include_role:
       name: etcd
-      tasks_from: backup
+      tasks_from: backup.yml
     vars:
       r_etcd_common_backup_tag: pre-migrate
       r_etcd_common_embedded_etcd: "{{ true }}"
@@ -42,7 +42,7 @@
 
   - include_role:
       name: etcd
-      tasks_from: backup.archive
+      tasks_from: backup.archive.yml
     vars:
       r_etcd_common_backup_tag: pre-migrate
       r_etcd_common_embedded_etcd: "{{ true }}"
@@ -58,7 +58,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: backup_master_etcd_certificates
+      tasks_from: backup_master_etcd_certificates.yml
 
 - name: Redeploy master etcd certificates
   import_playbook: master_etcd_certificates.yml
@@ -75,10 +75,10 @@
   pre_tasks:
   - include_role:
       name: etcd
-      tasks_from: disable_etcd
+      tasks_from: disable_etcd.yml
   - include_role:
       name: etcd
-      tasks_from: clean_data
+      tasks_from: clean_data.yml
 
 # 6. copy the embedded etcd backup to the external host
 # TODO(jchaloup): if the etcd and first master are on the same host, just copy the directory
@@ -93,7 +93,7 @@
 
   - include_role:
       name: etcd
-      tasks_from: backup.fetch
+      tasks_from: backup.fetch.yml
     vars:
       etcd_backup_sync_directory: "{{ g_etcd_client_mktemp.stdout }}"
       r_etcd_common_backup_tag: pre-migrate
@@ -103,7 +103,7 @@
 
   - include_role:
       name: etcd
-      tasks_from: backup.copy
+      tasks_from: backup.copy.yml
     vars:
       etcd_backup_sync_directory: "{{ g_etcd_client_mktemp.stdout }}"
       r_etcd_common_backup_tag: pre-migrate
@@ -124,14 +124,14 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: backup.unarchive
+      tasks_from: backup.unarchive.yml
     vars:
       r_etcd_common_backup_tag: pre-migrate
       r_etcd_common_backup_sufix_name: "{{ hostvars[groups.oo_first_master.0].embedded_etcd_backup_suffix }}"
 
   - include_role:
       name: etcd
-      tasks_from: backup.force_new_cluster
+      tasks_from: backup.force_new_cluster.yml
     vars:
       r_etcd_common_backup_tag: pre-migrate
       r_etcd_common_backup_sufix_name: "{{ hostvars[groups.oo_first_master.0].embedded_etcd_backup_suffix }}"
@@ -145,7 +145,7 @@
   tasks:
   - include_role:
       name: openshift_master
-      tasks_from: configure_external_etcd
+      tasks_from: configure_external_etcd.yml
     vars:
       etcd_peer_url_scheme: "https"
       etcd_ip: "{{ hostvars[groups.oo_etcd_to_config.0].openshift.common.ip }}"
diff --git a/playbooks/openshift-etcd/private/migrate.yml b/playbooks/openshift-etcd/private/migrate.yml
index 4269918c2..834bd242d 100644
--- a/playbooks/openshift-etcd/private/migrate.yml
+++ b/playbooks/openshift-etcd/private/migrate.yml
@@ -17,7 +17,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: migrate.pre_check
+      tasks_from: migrate.pre_check.yml
     vars:
       r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
       etcd_peer: "{{ ansible_default_ipv4.address }}"
@@ -46,7 +46,7 @@
   post_tasks:
   - include_role:
       name: etcd
-      tasks_from: backup
+      tasks_from: backup.yml
     vars:
       r_etcd_common_backup_tag: pre-migration
       r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
@@ -74,7 +74,7 @@
   pre_tasks:
   - include_role:
       name: etcd
-      tasks_from: disable_etcd
+      tasks_from: disable_etcd.yml
 
 - name: Migrate data on first etcd
   hosts: oo_etcd_to_migrate[0]
@@ -82,7 +82,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: migrate
+      tasks_from: migrate.yml
     vars:
       r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
       etcd_peer: "{{ openshift.common.ip }}"
@@ -95,7 +95,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: clean_data
+      tasks_from: clean_data.yml
     vars:
       r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
       etcd_peer: "{{ openshift.common.ip }}"
@@ -132,7 +132,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: migrate.add_ttls
+      tasks_from: migrate.add_ttls.yml
     vars:
       etcd_peer: "{{ hostvars[groups.oo_etcd_to_migrate.0].openshift.common.ip }}"
       etcd_url_scheme: "https"
@@ -144,7 +144,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: migrate.configure_master
+      tasks_from: migrate.configure_master.yml
     when: etcd_migration_failed | length == 0
   - debug:
       msg: "Skipping master re-configuration since migration failed."
diff --git a/playbooks/openshift-etcd/private/redeploy-ca.yml b/playbooks/openshift-etcd/private/redeploy-ca.yml
index cc5d57031..158bcb849 100644
--- a/playbooks/openshift-etcd/private/redeploy-ca.yml
+++ b/playbooks/openshift-etcd/private/redeploy-ca.yml
@@ -16,12 +16,12 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: backup_ca_certificates
+      tasks_from: backup_ca_certificates.yml
   - include_role:
       name: etcd
-      tasks_from: remove_ca_certificates
+      tasks_from: remove_ca_certificates.yml
 
-- include: ca.yml
+- import_playbook: ca.yml
 
 - name: Create temp directory for syncing certs
   hosts: localhost
@@ -44,7 +44,7 @@
       etcd_sync_cert_dir: "{{ hostvars['localhost'].g_etcd_mktemp.stdout }}"
       etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
 
-- include: restart.yml
+- import_playbook: restart.yml
   # Do not restart etcd when etcd certificates were previously expired.
   when: ('expired' not in (hostvars
                            | oo_select_keys(groups['etcd'])
@@ -56,7 +56,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: retrieve_ca_certificates
+      tasks_from: retrieve_ca_certificates.yml
     vars:
       etcd_sync_cert_dir: "{{ hostvars['localhost'].g_etcd_mktemp.stdout }}"
 
@@ -82,7 +82,7 @@
       state: absent
     changed_when: false
 
-- include: ../../openshift-master/private/restart.yml
+- import_playbook: ../../openshift-master/private/restart.yml
   # Do not restart masters when master or etcd certificates were previously expired.
   when:
   # masters
diff --git a/playbooks/openshift-etcd/private/redeploy-certificates.yml b/playbooks/openshift-etcd/private/redeploy-certificates.yml
index cc1e6adf5..1c8eb27ac 100644
--- a/playbooks/openshift-etcd/private/redeploy-certificates.yml
+++ b/playbooks/openshift-etcd/private/redeploy-certificates.yml
@@ -11,8 +11,8 @@
   # certificates were previously expired.
   - role: openshift_certificate_expiry
 
-- include: certificates-backup.yml
+- import_playbook: certificates-backup.yml
 
-- include: certificates.yml
+- import_playbook: certificates.yml
   vars:
     etcd_certificates_redeploy: true
diff --git a/playbooks/openshift-etcd/private/scaleup.yml b/playbooks/openshift-etcd/private/scaleup.yml
index fac8e3f02..3ef043ec8 100644
--- a/playbooks/openshift-etcd/private/scaleup.yml
+++ b/playbooks/openshift-etcd/private/scaleup.yml
@@ -32,7 +32,7 @@
     until: etcd_add_check.rc == 0
   - include_role:
       name: etcd
-      tasks_from: server_certificates
+      tasks_from: server_certificates.yml
     vars:
       etcd_peers: "{{ groups.oo_new_etcd_to_config | default([], true) }}"
       etcd_certificates_etcd_hosts: "{{ groups.oo_new_etcd_to_config | default([], true) }}"
@@ -78,4 +78,4 @@
   post_tasks:
   - include_role:
       name: openshift_master
-      tasks_from: update_etcd_client_urls
+      tasks_from: update_etcd_client_urls.yml
diff --git a/playbooks/openshift-etcd/private/server_certificates.yml b/playbooks/openshift-etcd/private/server_certificates.yml
index 14c74baf3..695b53990 100644
--- a/playbooks/openshift-etcd/private/server_certificates.yml
+++ b/playbooks/openshift-etcd/private/server_certificates.yml
@@ -7,7 +7,7 @@
   post_tasks:
     - include_role:
         name: etcd
-        tasks_from: server_certificates
+        tasks_from: server_certificates.yml
       vars:
         etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
         etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}"
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml b/playbooks/openshift-etcd/private/upgrade_backup.yml
index 531175c85..22ed7e610 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
+++ b/playbooks/openshift-etcd/private/upgrade_backup.yml
@@ -6,7 +6,7 @@
   post_tasks:
   - include_role:
       name: etcd
-      tasks_from: backup
+      tasks_from: backup.yml
     vars:
       r_etcd_common_backup_tag: "{{ etcd_backup_tag }}"
       r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml b/playbooks/openshift-etcd/private/upgrade_image_members.yml
index 6fca42bd0..c133c0201 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_image_members.yml
+++ b/playbooks/openshift-etcd/private/upgrade_image_members.yml
@@ -8,7 +8,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: upgrade_image
+      tasks_from: upgrade_image.yml
     vars:
       r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
       etcd_peer: "{{ openshift.common.hostname }}"
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml b/playbooks/openshift-etcd/private/upgrade_main.yml
index 5b8ba3bb2..e373a4a4c 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
+++ b/playbooks/openshift-etcd/private/upgrade_main.yml
@@ -6,7 +6,7 @@
 # available in the repos. So for Fedora we'll simply skip this, sorry.
 
 - name: Backup etcd before upgrading anything
-  include: backup.yml
+  import_playbook: upgrade_backup.yml
   vars:
     etcd_backup_tag: "pre-upgrade-"
   when: openshift_etcd_backup | default(true) | bool
@@ -16,14 +16,14 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: drop_etcdctl
+      tasks_from: drop_etcdctl.yml
 
 - name: Perform etcd upgrade
-  include: ./upgrade.yml
+  import_playbook: upgrade_step.yml
   when: openshift_etcd_upgrade | default(true) | bool
 
 - name: Backup etcd
-  include: backup.yml
+  import_playbook: upgrade_backup.yml
   vars:
     etcd_backup_tag: "post-3.0-"
   when: openshift_etcd_backup | default(true) | bool
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml b/playbooks/openshift-etcd/private/upgrade_rpm_members.yml
index 51e8786b3..902c39d9c 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade_rpm_members.yml
+++ b/playbooks/openshift-etcd/private/upgrade_rpm_members.yml
@@ -8,7 +8,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: upgrade_rpm
+      tasks_from: upgrade_rpm.yml
     vars:
       r_etcd_upgrade_version: "{{ etcd_upgrade_version }}"
       etcd_peer: "{{ openshift.common.hostname }}"
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml b/playbooks/openshift-etcd/private/upgrade_step.yml
index c5ff4133c..60127fc68 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml
+++ b/playbooks/openshift-etcd/private/upgrade_step.yml
@@ -6,47 +6,47 @@
       name: etcd
       tasks_from: version_detect.yml
 
-- include: upgrade_rpm_members.yml
+- import_playbook: upgrade_rpm_members.yml
   vars:
     etcd_upgrade_version: '2.1'
 
-- include: upgrade_rpm_members.yml
+- import_playbook: upgrade_rpm_members.yml
   vars:
     etcd_upgrade_version: '2.2'
 
-- include: upgrade_image_members.yml
+- import_playbook: upgrade_image_members.yml
   vars:
     etcd_upgrade_version: '2.2.5'
 
-- include: upgrade_rpm_members.yml
+- import_playbook: upgrade_rpm_members.yml
   vars:
     etcd_upgrade_version: '2.3'
 
-- include: upgrade_image_members.yml
+- import_playbook: upgrade_image_members.yml
   vars:
     etcd_upgrade_version: '2.3.7'
 
-- include: upgrade_rpm_members.yml
+- import_playbook: upgrade_rpm_members.yml
   vars:
     etcd_upgrade_version: '3.0'
 
-- include: upgrade_image_members.yml
+- import_playbook: upgrade_image_members.yml
   vars:
     etcd_upgrade_version: '3.0.15'
 
-- include: upgrade_rpm_members.yml
+- import_playbook: upgrade_rpm_members.yml
   vars:
     etcd_upgrade_version: '3.1'
 
-- include: upgrade_image_members.yml
+- import_playbook: upgrade_image_members.yml
   vars:
     etcd_upgrade_version: '3.1.3'
 
-- include: upgrade_rpm_members.yml
+- import_playbook: upgrade_rpm_members.yml
   vars:
     etcd_upgrade_version: '3.2'
 
-- include: upgrade_image_members.yml
+- import_playbook: upgrade_image_members.yml
   vars:
     etcd_upgrade_version: '3.2.7'
 
@@ -56,7 +56,7 @@
   tasks:
   - include_role:
       name: etcd
-      tasks_from: upgrade_image
+      tasks_from: upgrade_image.yml
     vars:
       etcd_peer: "{{ openshift.common.hostname }}"
     when:
diff --git a/playbooks/openshift-etcd/redeploy-ca.yml b/playbooks/openshift-etcd/redeploy-ca.yml
index b1d23675d..769d694ba 100644
--- a/playbooks/openshift-etcd/redeploy-ca.yml
+++ b/playbooks/openshift-etcd/redeploy-ca.yml
@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/redeploy-ca.yml
+- import_playbook: private/redeploy-ca.yml
diff --git a/playbooks/openshift-etcd/redeploy-certificates.yml b/playbooks/openshift-etcd/redeploy-certificates.yml
index 1bd302c03..753878d70 100644
--- a/playbooks/openshift-etcd/redeploy-certificates.yml
+++ b/playbooks/openshift-etcd/redeploy-certificates.yml
@@ -1,10 +1,10 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/redeploy-certificates.yml
+- import_playbook: private/redeploy-certificates.yml
 
-- include: private/restart.yml
+- import_playbook: 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 }}"
 
-- include: ../openshift-master/private/restart.yml
+- import_playbook: ../openshift-master/private/restart.yml
diff --git a/playbooks/openshift-etcd/upgrade.yml b/playbooks/openshift-etcd/upgrade.yml
new file mode 100644
index 000000000..ccc797527
--- /dev/null
+++ b/playbooks/openshift-etcd/upgrade.yml
@@ -0,0 +1,4 @@
+---
+- import_playbook: ../init/evaluate_groups.yml
+
+- import_playbook: private/upgrade_main.yml