diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-19 08:03:24 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-19 08:03:24 -0500 |
| commit | 631132c2f0e043b2d86bfd999eef5be001090eeb (patch) | |
| tree | f0ebeca3b679dcbd34ea644e7449adedd03e8a15 /roles/openshift_master | |
| parent | d42b92020d60550fc1ba6de97505d4c98f02f872 (diff) | |
| parent | dd5508bdb13af0c67aae49131b314d2c9443282c (diff) | |
| download | openshift-631132c2f0e043b2d86bfd999eef5be001090eeb.tar.gz openshift-631132c2f0e043b2d86bfd999eef5be001090eeb.tar.bz2 openshift-631132c2f0e043b2d86bfd999eef5be001090eeb.tar.xz openshift-631132c2f0e043b2d86bfd999eef5be001090eeb.zip | |
Merge pull request #881 from abutcher/namedCertRefactor
Refactor named certficates
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index bb12a0a0f..2a37c06d9 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -27,9 +27,6 @@ corsAllowedOrigins: {% for custom_origin in openshift.master.custom_cors_origins | default("") %} - {{ custom_origin }} {% endfor %} -{% for name in (named_certificates | map(attribute='names')) | list | oo_flatten %} - - {{ name }} -{% endfor %} {% if 'disabled_features' in openshift.master %} disabledFeatures: {{ openshift.master.disabled_features | to_json }} {% endif %} @@ -144,9 +141,9 @@ servingInfo: keyFile: master.server.key maxRequestsInFlight: 500 requestTimeoutSeconds: 3600 -{% if named_certificates %} +{% if openshift.master.named_certificates %} namedCertificates: -{% for named_certificate in named_certificates %} +{% for named_certificate in openshift.master.named_certificates %} - certFile: {{ named_certificate['certfile'] }} keyFile: {{ named_certificate['keyfile'] }} names: |