summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-18 18:09:40 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-21 09:26:01 -0500
commit89197481ce9f593ff5f7c2b37f0efbbfca61431e (patch)
tree24eba5652315e72cd19830165e55efd2a301777a /roles/openshift_master/templates
parent898b43c24a0db0f53cd272de0f3dec2a32bbc34e (diff)
downloadopenshift-89197481ce9f593ff5f7c2b37f0efbbfca61431e.tar.gz
openshift-89197481ce9f593ff5f7c2b37f0efbbfca61431e.tar.bz2
openshift-89197481ce9f593ff5f7c2b37f0efbbfca61431e.tar.xz
openshift-89197481ce9f593ff5f7c2b37f0efbbfca61431e.zip
Remove oauth_template bits from openshift_facts
This commit moves some deprecated variable logic outside of openshift_facts and into role defaults.
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index c224ad714..14023ea73 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -152,8 +152,8 @@ oauthConfig:
{% if 'oauth_always_show_provider_selection' in openshift.master %}
alwaysShowProviderSelection: {{ openshift.master.oauth_always_show_provider_selection }}
{% endif %}
-{% if 'oauth_templates' in openshift.master %}
- templates:{{ openshift.master.oauth_templates | lib_utils_to_padded_yaml(level=2) }}
+{% if l_openshift_master_oauth_templates %}
+ templates:{{ l_openshift_master_oauth_templates | lib_utils_to_padded_yaml(level=2) }}
{% endif %}
assetPublicURL: {{ openshift.master.public_console_url }}/
grantConfig: