diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-21 16:56:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 16:56:27 -0500 |
| commit | 8255f668ebac12171098f5ba6cbb74370ec3141c (patch) | |
| tree | 005604559faa06dcb5cae42c50dd1f47b594fb20 /playbooks/common/openshift-cluster | |
| parent | 51a0cbd42807c91a5e30fa58362b8745a40607f2 (diff) | |
| parent | 37cfec7fd40bc77c53368e8fc934d551d773c9bd (diff) | |
| download | openshift-8255f668ebac12171098f5ba6cbb74370ec3141c.tar.gz openshift-8255f668ebac12171098f5ba6cbb74370ec3141c.tar.bz2 openshift-8255f668ebac12171098f5ba6cbb74370ec3141c.tar.xz openshift-8255f668ebac12171098f5ba6cbb74370ec3141c.zip | |
Merge pull request #6158 from mtnbikenc/consolidate-openshift-node
Playbook Consolidation - openshift-node
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/openshift-ca.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 77b7a903f..81b163b80 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -13,7 +13,7 @@ - include: ../openshift-master/additional_config.yml -- include: ../openshift-node/config.yml +- include: ../../openshift-node/private/config.yml - include: ../openshift-glusterfs/config.yml when: groups.oo_glusterfs_to_config | default([]) | count > 0 diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml index eb225dfb5..b58bf3c91 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml @@ -272,7 +272,7 @@ state: absent changed_when: false -- include: ../../openshift-node/restart.yml +- include: ../../../openshift-node/private/restart.yml # Do not restart nodes when node, master or etcd certificates were previously expired. when: # nodes |