summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorSteve Kuznetsov <skuznets@redhat.com>2017-08-03 08:22:23 -0700
committerScott Dodson <sdodson@redhat.com>2017-08-03 13:01:22 -0400
commit553a9ce216e1fcca3fe759e9228704db773ad1b0 (patch)
treea74cc11067d4983b033e5cba67b4b8bde17089c9 /roles/openshift_facts/library
parent1765ce2bb6ab28a14c60dd5c268ec97ed788a1c1 (diff)
downloadopenshift-553a9ce216e1fcca3fe759e9228704db773ad1b0.tar.gz
openshift-553a9ce216e1fcca3fe759e9228704db773ad1b0.tar.bz2
openshift-553a9ce216e1fcca3fe759e9228704db773ad1b0.tar.xz
openshift-553a9ce216e1fcca3fe759e9228704db773ad1b0.zip
Update version checks to tolerate 3.7
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 42c4945b4..9301c17f8 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -915,6 +915,7 @@ def set_version_facts_if_unset(facts):
version_gte_3_4_or_1_4 = version >= LooseVersion('1.4')
version_gte_3_5_or_1_5 = version >= LooseVersion('1.5')
version_gte_3_6 = version >= LooseVersion('3.6')
+ version_gte_3_7 = version >= LooseVersion('3.7')
else:
version_gte_3_1_or_1_1 = version >= LooseVersion('3.0.2.905')
version_gte_3_1_1_or_1_1_1 = version >= LooseVersion('3.1.1')
@@ -923,6 +924,7 @@ def set_version_facts_if_unset(facts):
version_gte_3_4_or_1_4 = version >= LooseVersion('3.4')
version_gte_3_5_or_1_5 = version >= LooseVersion('3.5')
version_gte_3_6 = version >= LooseVersion('3.6')
+ version_gte_3_7 = version >= LooseVersion('3.7')
else:
# 'Latest' version is set to True, 'Next' versions set to False
version_gte_3_1_or_1_1 = True
@@ -932,6 +934,7 @@ def set_version_facts_if_unset(facts):
version_gte_3_4_or_1_4 = True
version_gte_3_5_or_1_5 = True
version_gte_3_6 = True
+ version_gte_3_7 = True
facts['common']['version_gte_3_1_or_1_1'] = version_gte_3_1_or_1_1
facts['common']['version_gte_3_1_1_or_1_1_1'] = version_gte_3_1_1_or_1_1_1
facts['common']['version_gte_3_2_or_1_2'] = version_gte_3_2_or_1_2
@@ -939,8 +942,11 @@ def set_version_facts_if_unset(facts):
facts['common']['version_gte_3_4_or_1_4'] = version_gte_3_4_or_1_4
facts['common']['version_gte_3_5_or_1_5'] = version_gte_3_5_or_1_5
facts['common']['version_gte_3_6'] = version_gte_3_6
+ facts['common']['version_gte_3_7'] = version_gte_3_7
- if version_gte_3_6:
+ if version_gte_3_7:
+ examples_content_version = 'v3.7'
+ elif version_gte_3_6:
examples_content_version = 'v3.6'
elif version_gte_3_5_or_1_5:
examples_content_version = 'v1.5'