summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-24 12:05:35 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-24 12:05:35 -0500
commitc54ad32e37ff11ae962bbf6bc48d3f5176383bdd (patch)
treeb566ef65f34670cb0def3d8fcf35ac466f567e95 /roles/openshift_facts/library
parent6de7cec289e5d390e6b2fb6d5ba096f55062f625 (diff)
parent6a8f686478b07666dfbf0ce10aac17b1de8902d5 (diff)
downloadopenshift-c54ad32e37ff11ae962bbf6bc48d3f5176383bdd.tar.gz
openshift-c54ad32e37ff11ae962bbf6bc48d3f5176383bdd.tar.bz2
openshift-c54ad32e37ff11ae962bbf6bc48d3f5176383bdd.tar.xz
openshift-c54ad32e37ff11ae962bbf6bc48d3f5176383bdd.zip
Merge pull request #1094 from abutcher/notify
Reset Type=notify for controllers service
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index c33e395a9..fed00132a 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -703,11 +703,16 @@ def set_version_facts_if_unset(facts):
if version is not None:
if deployment_type == 'origin':
version_gt_3_1_or_1_1 = LooseVersion(version) > LooseVersion('1.0.6')
+ version_gt_3_1_1_or_1_1_1 = LooseVersion(version) > LooseVersion('1.1.1')
else:
version_gt_3_1_or_1_1 = LooseVersion(version) > LooseVersion('3.0.2.900')
+ version_gt_3_1_1_or_1_1_1 = LooseVersion(version) > LooseVersion('3.1.1')
else:
version_gt_3_1_or_1_1 = True
+ version_gt_3_1_1_or_1_1_1 = True
facts['common']['version_greater_than_3_1_or_1_1'] = version_gt_3_1_or_1_1
+ facts['common']['version_greater_than_3_1_1_or_1_1_1'] = version_gt_3_1_1_or_1_1_1
+
return facts
def set_sdn_facts_if_unset(facts, system_facts):