summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-10-03 13:25:01 -0400
committerRussell Teague <rteague@redhat.com>2017-10-03 13:26:16 -0400
commit158bc58ed9df2926b04c63dc0c72a7aa4f2192a2 (patch)
tree0647ee8bc79c5c8a5d84704e2aff790a9bfee395 /playbooks/common
parent137e348d4ed1bf3561514009389ae72015d30c8d (diff)
downloadopenshift-158bc58ed9df2926b04c63dc0c72a7aa4f2192a2.tar.gz
openshift-158bc58ed9df2926b04c63dc0c72a7aa4f2192a2.tar.bz2
openshift-158bc58ed9df2926b04c63dc0c72a7aa4f2192a2.tar.xz
openshift-158bc58ed9df2926b04c63dc0c72a7aa4f2192a2.zip
Move etcd cert playbooks into etcd config path
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/config.yml4
-rw-r--r--playbooks/common/openshift-etcd/config.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 4ca0d48e4..66ae941c3 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -18,10 +18,6 @@
- docker_image_availability
- docker_storage
-- include: ../openshift-etcd/ca.yml
-
-- include: ../openshift-etcd/certificates.yml
-
- include: ../openshift-etcd/config.yml
- include: ../openshift-nfs/config.yml
diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml
index 2cae231b4..82539dac8 100644
--- a/playbooks/common/openshift-etcd/config.yml
+++ b/playbooks/common/openshift-etcd/config.yml
@@ -10,6 +10,10 @@
installer_phase_etcd: "In Progress"
aggregate: false
+- include: ca.yml
+
+- include: certificates.yml
+
- name: Configure etcd
hosts: oo_etcd_to_config
any_errors_fatal: true