summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
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_facts/library
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_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py21
1 files changed, 0 insertions, 21 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index d659286dc..d7c358a2f 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -656,26 +656,6 @@ def set_nodename(facts):
return facts
-def migrate_oauth_template_facts(facts):
- """
- Migrate an old oauth template fact to a newer format if it's present.
-
- The legacy 'oauth_template' fact was just a filename, and assumed you were
- setting the 'login' template.
-
- The new pluralized 'oauth_templates' fact is a dict mapping the template
- name to a filename.
-
- Simplify the code after this by merging the old fact into the new.
- """
- if 'master' in facts and 'oauth_template' in facts['master']:
- if 'oauth_templates' not in facts['master']:
- facts['master']['oauth_templates'] = {"login": facts['master']['oauth_template']}
- elif 'login' not in facts['master']['oauth_templates']:
- facts['master']['oauth_templates']['login'] = facts['master']['oauth_template']
- return facts
-
-
def format_url(use_ssl, hostname, port, path=''):
""" Format url based on ssl flag, hostname, port and path
@@ -1387,7 +1367,6 @@ class OpenShiftFacts(object):
facts = merge_facts(facts,
local_facts,
additive_facts_to_overwrite)
- facts = migrate_oauth_template_facts(facts)
facts['current_config'] = get_current_config(facts)
facts = set_url_facts_if_unset(facts)
facts = set_identity_providers_if_unset(facts)