summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-28 19:47:21 -0800
committerGitHub <noreply@github.com>2017-11-28 19:47:21 -0800
commit8f9f84b27ce12d07eed2269df0a118f112554f7a (patch)
tree881e768611b8bfbc91d4ae0945196dff50e8b10b /roles/openshift_facts
parentb7af6f115dd73cb7706fd76cd13fcd63aead7630 (diff)
parent42f206740d3b065ebdbc95f12315f922a1d70c7d (diff)
downloadopenshift-8f9f84b27ce12d07eed2269df0a118f112554f7a.tar.gz
openshift-8f9f84b27ce12d07eed2269df0a118f112554f7a.tar.bz2
openshift-8f9f84b27ce12d07eed2269df0a118f112554f7a.tar.xz
openshift-8f9f84b27ce12d07eed2269df0a118f112554f7a.zip
Merge pull request #6301 from mgugino-upstream-stage/project_cfg_facts
Automatic merge from submit-queue. Remove openshift_facts project_cfg_facts
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py29
1 files changed, 0 insertions, 29 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 44983cfd6..6fd5f5906 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -498,34 +498,6 @@ def set_selectors(facts):
return facts
-def set_project_cfg_facts_if_unset(facts):
- """ Set Project Configuration facts if not already present in facts dict
- dict:
- Args:
- facts (dict): existing facts
- Returns:
- dict: the facts dict updated with the generated Project Configuration
- facts if they were not already present
-
- """
-
- config = {
- 'default_node_selector': '',
- 'project_request_message': '',
- 'project_request_template': '',
- 'mcs_allocator_range': 's0:/2',
- 'mcs_labels_per_project': 5,
- 'uid_allocator_range': '1000000000-1999999999/10000'
- }
-
- if 'master' in facts:
- for key, value in config.items():
- if key not in facts['master']:
- facts['master'][key] = value
-
- return facts
-
-
def set_identity_providers_if_unset(facts):
""" Set identity_providers fact if not already present in facts dict
@@ -1800,7 +1772,6 @@ class OpenShiftFacts(object):
facts = migrate_oauth_template_facts(facts)
facts['current_config'] = get_current_config(facts)
facts = set_url_facts_if_unset(facts)
- facts = set_project_cfg_facts_if_unset(facts)
facts = set_selectors(facts)
facts = set_identity_providers_if_unset(facts)
facts = set_deployment_facts_if_unset(facts)