diff options
| author | Russell Teague <rteague@redhat.com> | 2017-12-07 12:06:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 12:06:32 -0500 |
| commit | 54175f4b668cc1e6108b7d0af13275fcda9f586f (patch) | |
| tree | 0dfe223febcbf59d1f9ee50b7fed0032e7ace42f /playbooks/openshift-etcd/private/redeploy-ca.yml | |
| parent | 9ee49e03676be3bc51c0f3ec341b1c4f6c1b0008 (diff) | |
| parent | 112e1696cc7d2c8c5b11682b584b45a37e947099 (diff) | |
| download | openshift-54175f4b668cc1e6108b7d0af13275fcda9f586f.tar.gz openshift-54175f4b668cc1e6108b7d0af13275fcda9f586f.tar.bz2 openshift-54175f4b668cc1e6108b7d0af13275fcda9f586f.tar.xz openshift-54175f4b668cc1e6108b7d0af13275fcda9f586f.zip | |
Merge pull request #6365 from mtnbikenc/consolidate-etcd-upgrade
Playbook Consolidation - etcd Upgrade
Diffstat (limited to 'playbooks/openshift-etcd/private/redeploy-ca.yml')
| -rw-r--r-- | playbooks/openshift-etcd/private/redeploy-ca.yml | 12 |
1 files changed, 6 insertions, 6 deletions
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 |