diff options
author | Andrew Butcher <abutcher@redhat.com> | 2015-10-28 10:39:41 -0400 |
---|---|---|
committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-03 11:24:13 -0500 |
commit | 8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d (patch) | |
tree | d138e6ddb5cca91d9aa14504e28c5f2f7205882d /roles/openshift_master | |
parent | 769a2e15cb505c53aab5953735566e6657dd17c3 (diff) | |
download | openshift-8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d.tar.gz openshift-8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d.tar.bz2 openshift-8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d.tar.xz openshift-8da7c1f5bc68110469bedceb0ddad4fdfc8b7e4d.zip |
Add custom certificates to serving info in master configuration.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 73a0bc6cc..b429be596 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -22,6 +22,9 @@ 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 %} @@ -133,3 +136,14 @@ servingInfo: keyFile: master.server.key maxRequestsInFlight: 500 requestTimeoutSeconds: 3600 +{% if named_certificates %} + namedCertificates: +{% for named_certificate in named_certificates %} + - certFile: {{ named_certificate['certfile'] }} + keyFile: {{ named_certificate['keyfile'] }} + names: +{% for name in named_certificate['names'] %} + - "{{ name }}" +{% endfor %} +{% endfor %} +{% endif %} |