diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-21 14:28:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 14:28:32 -0500 |
| commit | ffff1d7465d92e7f5522da11d6fd1ae23c54fdfb (patch) | |
| tree | 1d6e3abafaeee24c1b84c05d376dcaf70683c885 /playbooks/common/openshift-cluster | |
| parent | 33350641a1377c66356f8b4b96a7011607a29b50 (diff) | |
| parent | 79939ca092b9ee0fe31e5964102c60fca73da568 (diff) | |
| download | openshift-ffff1d7465d92e7f5522da11d6fd1ae23c54fdfb.tar.gz openshift-ffff1d7465d92e7f5522da11d6fd1ae23c54fdfb.tar.bz2 openshift-ffff1d7465d92e7f5522da11d6fd1ae23c54fdfb.tar.xz openshift-ffff1d7465d92e7f5522da11d6fd1ae23c54fdfb.zip | |
Merge pull request #6145 from mtnbikenc/consolidate-openshift-etcd
Playbook Consolidation - openshift-etcd
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index ad10ba821..77b7a903f 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -1,7 +1,7 @@ --- - include: ../../openshift-checks/private/install.yml -- include: ../openshift-etcd/config.yml +- include: ../../openshift-etcd/private/config.yml - include: ../../openshift-nfs/private/config.yml when: groups.oo_nfs_to_config | default([]) | count > 0 diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml index 044875d1c..41e19f5d6 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/etcd-ca.yml +++ b/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']) |