summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-10-03 13:18:49 -0400
committerRussell Teague <rteague@redhat.com>2017-10-03 13:26:27 -0400
commit0e2b7006aeace1885e5ebdcafd9c0308c7c3ce18 (patch)
tree4808be22eebfc8594ab47da23bba869435bba549
parenta34bb1142f01ff0768e386a3a025a5a9012fd8eb (diff)
downloadopenshift-0e2b7006aeace1885e5ebdcafd9c0308c7c3ce18.tar.gz
openshift-0e2b7006aeace1885e5ebdcafd9c0308c7c3ce18.tar.bz2
openshift-0e2b7006aeace1885e5ebdcafd9c0308c7c3ce18.tar.xz
openshift-0e2b7006aeace1885e5ebdcafd9c0308c7c3ce18.zip
Move node cert playbook into node config path
-rw-r--r--playbooks/byo/openshift-node/scaleup.yml2
-rw-r--r--playbooks/common/openshift-cluster/config.yml2
-rw-r--r--playbooks/common/openshift-node/config.yml2
3 files changed, 2 insertions, 4 deletions
diff --git a/playbooks/byo/openshift-node/scaleup.yml b/playbooks/byo/openshift-node/scaleup.yml
index 9f992cca6..e0c36fb69 100644
--- a/playbooks/byo/openshift-node/scaleup.yml
+++ b/playbooks/byo/openshift-node/scaleup.yml
@@ -16,6 +16,4 @@
- include: ../../common/openshift-cluster/std_include.yml
-- include: ../../common/openshift-node/certificates.yml
-
- include: ../../common/openshift-node/config.yml
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 8d548b1dd..96a43230d 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -30,8 +30,6 @@
- include: ../openshift-master/additional_config.yml
-- include: ../openshift-node/certificates.yml
-
- include: ../openshift-node/config.yml
- include: ../openshift-glusterfs/config.yml
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 6fd8aa6f1..700aab48c 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -10,6 +10,8 @@
installer_phase_node: "In Progress"
aggregate: false
+- include: certificates.yml
+
- include: setup.yml
- include: containerized_nodes.yml