diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-14 12:09:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 12:09:55 -0400 |
| commit | bc7816e7700cee6b6ab0bca4ebce20d4678ffa3a (patch) | |
| tree | 7f84259c0386f8adfe73462433bb6fe737fd9b7b /roles/openshift_master/templates | |
| parent | 8eff5bcea9097c239a3dc487289ad23e20e909b7 (diff) | |
| parent | 91065cc31b9025c44c3b4a9cfcddac4711898e82 (diff) | |
| download | openshift-bc7816e7700cee6b6ab0bca4ebce20d4678ffa3a.tar.gz openshift-bc7816e7700cee6b6ab0bca4ebce20d4678ffa3a.tar.bz2 openshift-bc7816e7700cee6b6ab0bca4ebce20d4678ffa3a.tar.xz openshift-bc7816e7700cee6b6ab0bca4ebce20d4678ffa3a.zip | |
Merge pull request #3599 from martineg/min_tls_version
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index aec48386e..938ac2a12 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -35,6 +35,15 @@ assetConfig: keyFile: master.server.key maxRequestsInFlight: 0 requestTimeoutSeconds: 0 +{% if openshift_master_min_tls_version is defined %} + minTLSVersion: {{ openshift_master_min_tls_version }} +{% endif %} +{% if openshift_master_cipher_suites is defined %} + cipherSuites: +{% for cipher_suite in openshift_master_cipher_suites %} + - {{ cipher_suite }} +{% endfor %} +{% endif %} {% if openshift_master_ha | bool %} {% if openshift.master.audit_config | default(none) is not none and openshift.common.version_gte_3_2_or_1_2 | bool %} auditConfig:{{ openshift.master.audit_config | to_padded_yaml(level=1) }} @@ -256,5 +265,14 @@ servingInfo: {% endfor %} {% endfor %} {% endif %} +{% if openshift_master_min_tls_version is defined %} + minTLSVersion: {{ openshift_master_min_tls_version }} +{% endif %} +{% if openshift_master_cipher_suites is defined %} + cipherSuites: +{% for cipher_suite in openshift_master_cipher_suites %} + - {{ cipher_suite }} +{% endfor %} +{% endif %} volumeConfig: dynamicProvisioningEnabled: {{ openshift.master.dynamic_provisioning_enabled }} |