summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-10 14:02:35 -0500
committerGitHub <noreply@github.com>2017-02-10 14:02:35 -0500
commiteacd7148d34a0410407819a41bccdb7ec34bec2e (patch)
tree61059a97ed84286154727d282b88e7fe51a380fb
parent08b1e9074f774c120f46192ee79965c713a7042c (diff)
parent75dcc04f40548aa93d175567de09f06f41f9c095 (diff)
downloadopenshift-eacd7148d34a0410407819a41bccdb7ec34bec2e.tar.gz
openshift-eacd7148d34a0410407819a41bccdb7ec34bec2e.tar.bz2
openshift-eacd7148d34a0410407819a41bccdb7ec34bec2e.tar.xz
openshift-eacd7148d34a0410407819a41bccdb7ec34bec2e.zip
Merge pull request #3331 from abutcher/embedded-etcd-client-cert
Bug 1420667: Ensure etcd client certs are regenerated with embedded etcd.
-rw-r--r--playbooks/common/openshift-cluster/redeploy-certificates/masters.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/masters.yml b/playbooks/common/openshift-cluster/redeploy-certificates/masters.yml
index f653a111f..c30889d64 100644
--- a/playbooks/common/openshift-cluster/redeploy-certificates/masters.yml
+++ b/playbooks/common/openshift-cluster/redeploy-certificates/masters.yml
@@ -36,6 +36,14 @@
- "openshift-master.crt"
- "openshift-master.key"
- "openshift-master.kubeconfig"
+ - name: Remove generated etcd client certificates
+ file:
+ path: "{{ openshift.common.config_base }}/master/{{ item }}"
+ state: absent
+ with_items:
+ - "master.etcd-client.crt"
+ - "master.etcd-client.key"
+ when: groups.oo_etcd_to_config | default([]) | length == 0
roles:
- role: openshift_master_certificates
openshift_master_etcd_hosts: "{{ hostvars