summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-etcd/private/redeploy-ca.yml
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-12-05 16:30:06 -0500
committerRussell Teague <rteague@redhat.com>2017-12-05 16:30:06 -0500
commit112e1696cc7d2c8c5b11682b584b45a37e947099 (patch)
tree07d19cfd81c7d323ac10a1fd1568f562014431c9 /playbooks/openshift-etcd/private/redeploy-ca.yml
parent968f614e984da91a4e883a9642af8e66d49d87a0 (diff)
downloadopenshift-112e1696cc7d2c8c5b11682b584b45a37e947099.tar.gz
openshift-112e1696cc7d2c8c5b11682b584b45a37e947099.tar.bz2
openshift-112e1696cc7d2c8c5b11682b584b45a37e947099.tar.xz
openshift-112e1696cc7d2c8c5b11682b584b45a37e947099.zip
Playbook Consolidation - etcd Upgrade
Diffstat (limited to 'playbooks/openshift-etcd/private/redeploy-ca.yml')
-rw-r--r--playbooks/openshift-etcd/private/redeploy-ca.yml12
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