summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2017-01-25 10:27:54 -0500
committerGitHub <noreply@github.com>2017-01-25 10:27:54 -0500
commit22706eb1bef19329ac0e72303d02f1c47e48e825 (patch)
tree084883460dece300d39312163bdc8605c456773d /roles/openshift_facts/library
parent1cfe0439df91c299643e7db4c3dc8a48863d8ee2 (diff)
parent0f0b4b3bb3aea5163d91b25818d0f4b06e06ceaa (diff)
downloadopenshift-22706eb1bef19329ac0e72303d02f1c47e48e825.tar.gz
openshift-22706eb1bef19329ac0e72303d02f1c47e48e825.tar.bz2
openshift-22706eb1bef19329ac0e72303d02f1c47e48e825.tar.xz
openshift-22706eb1bef19329ac0e72303d02f1c47e48e825.zip
Merge pull request #3178 from abutcher/free-master-count
Remove master_count restriction.
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index f7506bd63..78886dcea 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1460,7 +1460,7 @@ def merge_facts(orig, new, additive_facts_to_overwrite, protected_facts_to_overw
dict: the merged facts
"""
additive_facts = ['named_certificates']
- protected_facts = ['ha', 'master_count']
+ protected_facts = ['ha']
# Facts we do not ever want to merge. These originate in inventory variables
# and contain JSON dicts. We don't ever want to trigger a merge
@@ -1513,14 +1513,6 @@ def merge_facts(orig, new, additive_facts_to_overwrite, protected_facts_to_overw
# it so we will determine if it is okay to change this
# fact.
elif key in protected_facts and key not in [x.split('.')[-1] for x in protected_facts_to_overwrite]:
- # The master count (int) can only increase unless it
- # has been passed as a protected fact to overwrite.
- if key == 'master_count' and new[key] is not None and new[key] is not '':
- if int(value) <= int(new[key]):
- facts[key] = copy.deepcopy(new[key])
- else:
- # pylint: disable=line-too-long
- module.fail_json(msg='openshift_facts received a lower value for openshift.master.master_count') # noqa: F405
# ha (bool) can not change unless it has been passed
# as a protected fact to overwrite.
if key == 'ha':