summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-12-18 15:03:16 -0500
committerAndrew Butcher <abutcher@redhat.com>2015-12-18 15:59:18 -0500
commit6a8f686478b07666dfbf0ce10aac17b1de8902d5 (patch)
treefe43715bbcb5af487053992068079ebea3f9237a /roles/openshift_facts/library
parent0d6cc805ad7ada87c5c39eec518b42b99f1e31f0 (diff)
downloadopenshift-6a8f686478b07666dfbf0ce10aac17b1de8902d5.tar.gz
openshift-6a8f686478b07666dfbf0ce10aac17b1de8902d5.tar.bz2
openshift-6a8f686478b07666dfbf0ce10aac17b1de8902d5.tar.xz
openshift-6a8f686478b07666dfbf0ce10aac17b1de8902d5.zip
Conditionalize for 3.1.1/1.1.1
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 e557853b1..c36cce750 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -690,11 +690,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):