summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-07 09:15:46 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-07 14:02:32 -0500
commit0097ce2b4c8c751cfa10b61d7e34dcf785755951 (patch)
tree89d332f5ed1da7188038694280009cce49a33f2e /roles/openshift_facts
parent2d13cea12a01caaea20d4bae874db7ee7beaf22f (diff)
downloadopenshift-0097ce2b4c8c751cfa10b61d7e34dcf785755951.tar.gz
openshift-0097ce2b4c8c751cfa10b61d7e34dcf785755951.tar.bz2
openshift-0097ce2b4c8c751cfa10b61d7e34dcf785755951.tar.xz
openshift-0097ce2b4c8c751cfa10b61d7e34dcf785755951.zip
Bug 1296388 - The playbook still configure ManageIQ when openshift_use_manageiq is false
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 8dc16f5e4..be2818dce 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -730,8 +730,8 @@ def set_manageiq_facts_if_unset(facts):
raise OpenShiftFactsInternalError(
"Invalid invocation: The required facts are not set"
)
-
- facts['common']['use_manageiq'] = facts['common']['version_greater_than_3_1_or_1_1']
+ if 'use_mangeiq' not in facts['common']:
+ facts['common']['use_manageiq'] = facts['common']['version_greater_than_3_1_or_1_1']
return facts