diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-04 11:28:10 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-04 11:28:10 -0500 |
| commit | 9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a (patch) | |
| tree | a55287a31398cd2edaaa0c8f0a9f5a33e79d309d /roles/openshift_master | |
| parent | c792e1d19863e063a9544967f5b892030791bbd1 (diff) | |
| parent | 3a8b4f1315e28f35e16ace77560f040f08588722 (diff) | |
| download | openshift-9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a.tar.gz openshift-9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a.tar.bz2 openshift-9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a.tar.xz openshift-9ceee5dfeb5a7acfdb1e6b427e288596c4e4f64a.zip | |
Merge pull request #767 from abutcher/custom-certs
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 | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 73a0bc6cc..9547a6945 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -16,12 +16,15 @@ assetConfig: maxRequestsInFlight: 0 requestTimeoutSeconds: 0 corsAllowedOrigins: -{% for origin in ['127.0.0.1', 'localhost', openshift.common.hostname, openshift.common.ip, openshift.common.public_hostname, openshift.common.public_ip] %} +{% for origin in ['127.0.0.1', 'localhost', openshift.common.hostname, openshift.common.ip, openshift.common.public_hostname, openshift.common.public_ip] | unique %} - {{ origin }} {% endfor %} {% 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 %} |