summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-20 11:49:01 -0700
committerGitHub <noreply@github.com>2017-10-20 11:49:01 -0700
commit4e79d8e33413ba94d951ba5958b7481c3addf96e (patch)
tree5c05a7b3bb99cad4702ffb74c2f22c7dadbab00c
parenta56c93842e4917dc50a25188feaaa1f74cd98143 (diff)
parent0a1bfc2a1359ae18b72e31b189769c043be1494f (diff)
downloadopenshift-4e79d8e33413ba94d951ba5958b7481c3addf96e.tar.gz
openshift-4e79d8e33413ba94d951ba5958b7481c3addf96e.tar.bz2
openshift-4e79d8e33413ba94d951ba5958b7481c3addf96e.tar.xz
openshift-4e79d8e33413ba94d951ba5958b7481c3addf96e.zip
Merge pull request #5749 from abutcher/servinginfo-client-ca-upgrade
Automatic merge from submit-queue. Set servingInfo.clientCA to ca.crt during upgrade. https://bugzilla.redhat.com/show_bug.cgi?id=1501795
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_6/master_config_upgrade.yml5
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_6/master_config_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_6/master_config_upgrade.yml
index 52458e03c..db0c8f886 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_6/master_config_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_6/master_config_upgrade.yml
@@ -8,3 +8,8 @@
dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
yaml_key: 'controllerConfig.serviceServingCert.signer.keyFile'
yaml_value: service-signer.key
+
+- modify_yaml:
+ dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+ yaml_key: servingInfo.clientCA
+ yaml_value: ca.crt
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml
index c26e8f744..1d4d1919c 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_7/master_config_upgrade.yml
@@ -13,3 +13,8 @@
dest: "{{ openshift.common.config_base}}/master/master-config.yaml"
yaml_key: 'controllerConfig.serviceServingCert.signer.keyFile'
yaml_value: service-signer.key
+
+- modify_yaml:
+ dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+ yaml_key: servingInfo.clientCA
+ yaml_value: ca.crt