diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-01-12 13:33:03 -0500 |
|---|---|---|
| committer | Samuel Padgett <spadgett@redhat.com> | 2018-01-25 14:56:10 -0500 |
| commit | 8cb61e9428e82e38070c1de0d6ab1fff45a7ff13 (patch) | |
| tree | 3317a70b73364603a341f661a653da929358c97b | |
| parent | 6c921b0877c38c2a6e55cd5852a740ec88fde8fb (diff) | |
| download | openshift-8cb61e9428e82e38070c1de0d6ab1fff45a7ff13.tar.gz openshift-8cb61e9428e82e38070c1de0d6ab1fff45a7ff13.tar.bz2 openshift-8cb61e9428e82e38070c1de0d6ab1fff45a7ff13.tar.xz openshift-8cb61e9428e82e38070c1de0d6ab1fff45a7ff13.zip | |
Don't emit assetConfig on 3.9
| -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 %} |