summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/redeploy-certificates
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2017-02-09 13:00:41 -0500
committerGitHub <noreply@github.com>2017-02-09 13:00:41 -0500
commit8b6f88ea657662fb6724c2d4863b6c954f9580d8 (patch)
tree108ecf6944c74ade314bcdcd75f7cb6f814cf479 /playbooks/common/openshift-cluster/redeploy-certificates
parent863f345972b1cf9ed28d682acdf2b74559f79211 (diff)
parentb0ca3ea0a2ffd7917650ca648c940746b8a7825a (diff)
downloadopenshift-8b6f88ea657662fb6724c2d4863b6c954f9580d8.tar.gz
openshift-8b6f88ea657662fb6724c2d4863b6c954f9580d8.tar.bz2
openshift-8b6f88ea657662fb6724c2d4863b6c954f9580d8.tar.xz
openshift-8b6f88ea657662fb6724c2d4863b6c954f9580d8.zip
Merge pull request #3312 from abutcher/embedded-etcd-bundle
Ensure embedded etcd config points to CA bundle.
Diffstat (limited to 'playbooks/common/openshift-cluster/redeploy-certificates')
-rw-r--r--playbooks/common/openshift-cluster/redeploy-certificates/ca.yml21
1 files changed, 21 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml
index 0b1c39ba4..9d4d3ea26 100644
--- a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml
+++ b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml
@@ -160,6 +160,27 @@
yaml_key: servingInfo.clientCA
yaml_value: ca-bundle.crt
when: (g_master_config_output.content|b64decode|from_yaml).servingInfo.clientCA != 'ca-bundle.crt'
+ - modify_yaml:
+ dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+ yaml_key: etcdClientInfo.ca
+ yaml_value: ca-bundle.crt
+ when:
+ - groups.oo_etcd_to_config | default([]) | length == 0
+ - (g_master_config_output.content|b64decode|from_yaml).etcdClientInfo.ca != 'ca-bundle.crt'
+ - modify_yaml:
+ dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+ yaml_key: etcdConfig.peerServingInfo.clientCA
+ yaml_value: ca-bundle.crt
+ when:
+ - groups.oo_etcd_to_config | default([]) | length == 0
+ - (g_master_config_output.content|b64decode|from_yaml).etcdConfig.peerServingInfo.clientCA != 'ca-bundle.crt'
+ - modify_yaml:
+ dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+ yaml_key: etcdConfig.servingInfo.clientCA
+ yaml_value: ca-bundle.crt
+ when:
+ - groups.oo_etcd_to_config | default([]) | length == 0
+ - (g_master_config_output.content|b64decode|from_yaml).etcdConfig.servingInfo.clientCA != 'ca-bundle.crt'
- name: Copy current OpenShift CA to legacy directory
hosts: oo_masters_to_config