diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-06 19:39:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 19:39:48 -0800 |
| commit | 7b2afd71ea20e5e6a5f38f02f65b3202c78fabb1 (patch) | |
| tree | 9e30cba6a3aba2ac02f8411b1f5deba115ece8e8 /playbooks/common/openshift-master | |
| parent | 3d1677e3e2db0cac168e9cdec692506ed86f32d2 (diff) | |
| parent | 89fcbb72447ab74b440c15d1e35a1dd10cef1c49 (diff) | |
| download | openshift-7b2afd71ea20e5e6a5f38f02f65b3202c78fabb1.tar.gz openshift-7b2afd71ea20e5e6a5f38f02f65b3202c78fabb1.tar.bz2 openshift-7b2afd71ea20e5e6a5f38f02f65b3202c78fabb1.tar.xz openshift-7b2afd71ea20e5e6a5f38f02f65b3202c78fabb1.zip | |
Merge pull request #6031 from abutcher/temporary-servinginfo-clientca
Automatic merge from submit-queue.
Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during rolling CA redeployment.
This PR temporarily configures master `servingInfo.clientCA` as `client-ca-bundle.crt` during CA redeploy so that clients referencing the old OpenShift CA can continue to function until all cluster certificates have been replaced and `servingInfo.clientCA` is reset to `ca.crt`.
`client-ca-bundle.crt` is a new bundle created by the `openshift_ca` role which contains old and new OpenShift CA certificates.
https://bugzilla.redhat.com/show_bug.cgi?id=1509124
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1493276
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/revert-client-ca.yml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/revert-client-ca.yml b/playbooks/common/openshift-master/revert-client-ca.yml new file mode 100644 index 000000000..9ae23bf5b --- /dev/null +++ b/playbooks/common/openshift-master/revert-client-ca.yml @@ -0,0 +1,17 @@ +--- +- name: Set servingInfo.clientCA = ca.crt in master config + hosts: oo_masters_to_config + tasks: + - name: Read master config + slurp: + src: "{{ openshift.common.config_base }}/master/master-config.yaml" + register: g_master_config_output + + # servingInfo.clientCA may be set as the client-ca-bundle.crt from + # CA redeployment and this task reverts that change. + - name: Set servingInfo.clientCA = ca.crt in master config + modify_yaml: + dest: "{{ openshift.common.config_base }}/master/master-config.yaml" + yaml_key: servingInfo.clientCA + yaml_value: ca.crt + when: (g_master_config_output.content|b64decode|from_yaml).servingInfo.clientCA != 'ca.crt' |