diff options
| author | Dan Yocum <dyocum@redhat.com> | 2018-01-26 15:39:50 -0500 |
|---|---|---|
| committer | Dan Yocum <dyocum@redhat.com> | 2018-01-26 15:39:50 -0500 |
| commit | 7dceb6260a333e29c922dad8613ae6a0946fa07b (patch) | |
| tree | 1c7c40a6c68e0668af2e2a5d0b865a4ef6af371d /roles/openshift_master | |
| parent | 501e7897b7becb1e5a5c7875b40675d1e7296ed7 (diff) | |
| parent | 13e73c31a827d6fca810e120a7b3b6573b2eeb4b (diff) | |
| download | openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.gz openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.bz2 openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.xz openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.zip | |
Merge branch 'master' of github.com:openshift/openshift-ansible into rm_origin-components
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 %} |