diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-26 10:41:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 10:41:44 -0500 |
| commit | c6423636a4d14139960f4677dbab8fa646d1cb0c (patch) | |
| tree | 56b6d96449cd4819959ab64ea391eaf0a8af856c /roles/openshift_master | |
| parent | 6e9a9c3e50446a1bd716272e4a47785ad8ecbf08 (diff) | |
| parent | ef6d01b6c0a4000133ab443a0a3d52d686484fc9 (diff) | |
| download | openshift-c6423636a4d14139960f4677dbab8fa646d1cb0c.tar.gz openshift-c6423636a4d14139960f4677dbab8fa646d1cb0c.tar.bz2 openshift-c6423636a4d14139960f4677dbab8fa646d1cb0c.tar.xz openshift-c6423636a4d14139960f4677dbab8fa646d1cb0c.zip | |
Merge pull request #6821 from spadgett/remove-asset-config
Remove old assetConfig from master-config.yaml
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 14023ea73..4c9ab1864 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -5,6 +5,7 @@ admissionConfig: apiLevels: - v1 apiVersion: v1 +{% if not openshift.common.version_gte_3_9 %} assetConfig: logoutURL: "{{ openshift.master.logout_url | default('') }}" masterPublicURL: {{ openshift.master.public_api_url }} @@ -41,6 +42,8 @@ assetConfig: - {{ cipher_suite }} {% endfor %} {% endif %} +# assetconfig end +{% endif %} {% if openshift.master.audit_config | default(none) is not none %} auditConfig:{{ openshift.master.audit_config | lib_utils_to_padded_yaml(level=1) }} {% endif %} |