diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-12 22:53:10 -0300 | 
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-12 22:53:10 -0300 | 
| commit | 0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef (patch) | |
| tree | 14a91c960183ca56567844f2d575c5e161c7a2ce /roles/openshift_facts/library | |
| parent | ec293f371046a99b0f737a59b4a9f3f001af3279 (diff) | |
| download | openshift-0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef.tar.gz openshift-0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef.tar.bz2 openshift-0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef.tar.xz openshift-0bc39b7f4ad53344d19d0d783fd6eec4d3b424ef.zip  | |
Update PR #458 from comments
Diffstat (limited to 'roles/openshift_facts/library')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 28 | 
1 files changed, 0 insertions, 28 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 0fde372ed..4e0989c5f 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -349,33 +349,6 @@ def set_identity_providers_if_unset(facts):      return facts -def set_project_config_if_unset(facts): -    """ Set project_config fact if not already present in facts dict - -        Args: -            facts (dict): existing facts -        Returns: -            dict: the facts dict updated with the generated identity providers -            facts if they were not already present -    """ -    if 'master' in facts: -        if 'project_config' not in facts['master']: -            config = dict( -                projectConfig=dict( -                    defaultNodeSelector='', -                    projectRequestMessage='', -                    projectRequestTemplate='', -                        securityAllocator=dict( -                            mcsAllocatorRange='s0:/2', -                            mcsLabelsPerProject=5, -                            uidAllocatorRange='1000000000-1999999999/10000' -                        ) -                    ) -                )             -            facts['master']['project_config'] = [config] - -    return facts -  def set_url_facts_if_unset(facts):      """ Set url facts if not already present in facts dict @@ -727,7 +700,6 @@ class OpenShiftFacts(object):          facts['current_config'] = get_current_config(facts)          facts = set_url_facts_if_unset(facts)          facts = set_fluentd_facts_if_unset(facts) -        facts = set_project_config_if_unset(facts)          facts = set_identity_providers_if_unset(facts)          facts = set_registry_url_if_unset(facts)          facts = set_sdn_facts_if_unset(facts)  | 
