summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-07 15:07:43 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-07 15:07:43 -0500
commit44f5558d66026c5e5fe94509f52fe7e4f8d22b67 (patch)
treea3de8b0bbe79e398a85f29415a85c584da7f0032
parent51eeaf70c19e4f79d136c8d7470fe91cc780b813 (diff)
parent0097ce2b4c8c751cfa10b61d7e34dcf785755951 (diff)
downloadopenshift-44f5558d66026c5e5fe94509f52fe7e4f8d22b67.tar.gz
openshift-44f5558d66026c5e5fe94509f52fe7e4f8d22b67.tar.bz2
openshift-44f5558d66026c5e5fe94509f52fe7e4f8d22b67.tar.xz
openshift-44f5558d66026c5e5fe94509f52fe7e4f8d22b67.zip
Merge pull request #1129 from brenton/manageiq
Bug 1296388 - The playbook still configure ManageIQ when openshift_us…
-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