diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-09 14:28:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 14:28:15 -0700 |
| commit | 60c770af09aaf5572b61d6d71ddda88db2dd7de2 (patch) | |
| tree | 525cd158daadd40eb447d2225b7773302c54637e | |
| parent | 0cc86f37d49c3effdee8c47911333d76c432f1b7 (diff) | |
| parent | db2363e1aacfa472d55c8421211061240a6f49fb (diff) | |
| download | openshift-60c770af09aaf5572b61d6d71ddda88db2dd7de2.tar.gz openshift-60c770af09aaf5572b61d6d71ddda88db2dd7de2.tar.bz2 openshift-60c770af09aaf5572b61d6d71ddda88db2dd7de2.tar.xz openshift-60c770af09aaf5572b61d6d71ddda88db2dd7de2.zip | |
Merge pull request #5698 from abutcher/servinginfo-client-ca
Automatic merge from submit-queue.
Bug 1493276: Setting servingInfo.clientCA to ca-bundle.crt can cause unwanted client cert popups in browser when hitting console
https://bugzilla.redhat.com/show_bug.cgi?id=1493276
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml index e4193a00e..2068ed199 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/openshift-ca.yml @@ -44,8 +44,8 @@ - modify_yaml: dest: "{{ openshift.common.config_base }}/master/master-config.yaml" yaml_key: servingInfo.clientCA - yaml_value: ca-bundle.crt - when: (g_master_config_output.content|b64decode|from_yaml).servingInfo.clientCA != 'ca-bundle.crt' + yaml_value: ca.crt + when: (g_master_config_output.content|b64decode|from_yaml).servingInfo.clientCA != 'ca.crt' - modify_yaml: dest: "{{ openshift.common.config_base }}/master/master-config.yaml" yaml_key: etcdClientInfo.ca diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index d045b402b..9b3fbcf49 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -251,11 +251,7 @@ servingInfo: bindAddress: {{ openshift.master.bind_addr }}:{{ openshift.master.api_port }} bindNetwork: tcp4 certFile: master.server.crt -{% if openshift.common.version_gte_3_2_or_1_2 | bool %} - clientCA: ca-bundle.crt -{% else %} clientCA: ca.crt -{% endif %} keyFile: master.server.key maxRequestsInFlight: {{ openshift.master.max_requests_inflight }} requestTimeoutSeconds: 3600 |