summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/defaults
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/defaults
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/defaults')
-rw-r--r--roles/openshift_master/defaults/main.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index 5d292ffd0..4030e1bfa 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -82,6 +82,15 @@ openshift_master_valid_grant_methods:
openshift_master_is_scaleup_host: False
+# openshift_master_oauth_template is deprecated. Should be added to deprecations
+# and removed.
+openshift_master_oauth_template: False
+openshift_master_oauth_templates_default:
+ login: "{{ openshift_master_oauth_template }}"
+openshift_master_oauth_templates: "{{ openshift_master_oauth_template | ternary(openshift_master_oauth_templates_default, False) }}"
+# Here we combine openshift_master_oath_template into 'login' key of openshift_master_oath_templates, if not present.
+l_openshift_master_oauth_templates: "{{ openshift_master_oauth_templates | default(openshift_master_oauth_templates_default) }}"
+
# These defaults assume forcing journald persistence, fsync to disk once
# a second, rate-limiting to 10,000 logs a second, no forwarding to
# syslog or wall, using 8GB of disk space maximum, using 10MB journal