summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-10-09 10:42:19 -0400
committerAndrew Butcher <abutcher@redhat.com>2017-10-09 10:42:19 -0400
commitdb2363e1aacfa472d55c8421211061240a6f49fb (patch)
tree90486ad95083d35a40e4a61e579a452392f7740e /roles/openshift_master
parentb37c5e648736c11913c56ee2b9620920ef42e99e (diff)
downloadopenshift-db2363e1aacfa472d55c8421211061240a6f49fb.tar.gz
openshift-db2363e1aacfa472d55c8421211061240a6f49fb.tar.bz2
openshift-db2363e1aacfa472d55c8421211061240a6f49fb.tar.xz
openshift-db2363e1aacfa472d55c8421211061240a6f49fb.zip
Ensure servingInfo.clientCA is set as ca.crt rather than ca-bundle.crt.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
1 files changed, 0 insertions, 4 deletions
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