From 158bc58ed9df2926b04c63dc0c72a7aa4f2192a2 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Tue, 3 Oct 2017 13:25:01 -0400 Subject: Move etcd cert playbooks into etcd config path --- playbooks/common/openshift-cluster/config.yml | 4 ---- playbooks/common/openshift-etcd/config.yml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'playbooks') 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 -- cgit v1.2.3