diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-03 13:03:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-03 13:03:46 -0400 |
| commit | 71bc6b9a67d83c0618ac9a786a6cb0d1abd907da (patch) | |
| tree | d6d4151be2a2e5621559f8584c3c7aa957e386aa /roles/openshift_master/templates | |
| parent | 723c1fb1d73582cd0209cdc7201231b258161555 (diff) | |
| parent | 4c66a9b62488b5e344f2e65cda6bc2ba3e0f2933 (diff) | |
| download | openshift-71bc6b9a67d83c0618ac9a786a6cb0d1abd907da.tar.gz openshift-71bc6b9a67d83c0618ac9a786a6cb0d1abd907da.tar.bz2 openshift-71bc6b9a67d83c0618ac9a786a6cb0d1abd907da.tar.xz openshift-71bc6b9a67d83c0618ac9a786a6cb0d1abd907da.zip | |
Merge pull request #2049 from abutcher/named-certificates
Named CA Certificates
Diffstat (limited to 'roles/openshift_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index b18a42e32..662f23aa3 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -156,7 +156,11 @@ oauthConfig: {% for line in translated_identity_providers.splitlines() %} {{ line }} {% endfor %} - masterCA: ca.crt +{% if openshift.common.version_gte_3_2_or_1_2 | bool %} + masterCA: ca-bundle.crt +{% else %} + masterCA: ca.rt +{% endif %} masterPublicURL: {{ openshift.master.public_api_url }} masterURL: {{ openshift.master.api_url }} sessionConfig: @@ -189,7 +193,11 @@ serviceAccountConfig: - default - builder - deployer - masterCA: ca.crt +{% if openshift.common.version_gte_3_2_or_1_2 | bool %} + masterCA: ca-bundle.crt +{% else %} + masterCA: ca.rt +{% endif %} privateKeyFile: serviceaccounts.private.key publicKeyFiles: - serviceaccounts.public.key @@ -201,7 +209,7 @@ servingInfo: keyFile: master.server.key maxRequestsInFlight: {{ openshift.master.max_requests_inflight }} requestTimeoutSeconds: 3600 -{% if openshift.master.named_certificates %} +{% if openshift.master.named_certificates | default([]) | length > 0 %} namedCertificates: {% for named_certificate in openshift.master.named_certificates %} - certFile: {{ named_certificate['certfile'] }} |