summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-etcd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-04 16:30:31 -0700
committerGitHub <noreply@github.com>2017-10-04 16:30:31 -0700
commit30daf85143720c1350a197a8b40f9f1dbff34f29 (patch)
tree74cd101e291de9d950a738f836f0640639d57291 /playbooks/common/openshift-etcd
parentcb7505c0f76f8388b49b36550376fbae1654c04f (diff)
parent2c483c16492dda53c2ffff5b6b84172046d58c67 (diff)
downloadopenshift-30daf85143720c1350a197a8b40f9f1dbff34f29.tar.gz
openshift-30daf85143720c1350a197a8b40f9f1dbff34f29.tar.bz2
openshift-30daf85143720c1350a197a8b40f9f1dbff34f29.tar.xz
openshift-30daf85143720c1350a197a8b40f9f1dbff34f29.zip
Merge pull request #5643 from mtnbikenc/refactor-certificates
Automatic merge from submit-queue. Refactor certificate playbooks for checkpointing The recent breakout of the certificate playbooks resulted in the certificate portion of the install to be outside of the component checkpoint. This PR moves the certificate playbooks inside their respective config.yml playbook. Removes an unused tasks file from the openshift_named_certificates role.
Diffstat (limited to 'playbooks/common/openshift-etcd')
-rw-r--r--playbooks/common/openshift-etcd/config.yml4
1 files changed, 4 insertions, 0 deletions
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