diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2015-11-12 10:46:25 -0500 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-16 14:23:20 -0500 |
| commit | 03e6ae850ce718c008636bd8db093f453e62ccf3 (patch) | |
| tree | 1d3583b5e2ccbb8b2fbdc0f3c5ea824a79803063 /roles/openshift_master | |
| parent | 947ea1eae90b678c93b8f8118904f6ce2e3026c8 (diff) | |
| download | openshift-03e6ae850ce718c008636bd8db093f453e62ccf3.tar.gz openshift-03e6ae850ce718c008636bd8db093f453e62ccf3.tar.bz2 openshift-03e6ae850ce718c008636bd8db093f453e62ccf3.tar.xz openshift-03e6ae850ce718c008636bd8db093f453e62ccf3.zip | |
Refactor named certificates.
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: |