diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-03 15:08:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-03 15:08:27 -0400 |
| commit | 05a9c91735cc95457411dbb19951341e5418df18 (patch) | |
| tree | f9c9bb750370732e83daedb36e44aa199aaceccb /roles/openshift_facts | |
| parent | 1765ce2bb6ab28a14c60dd5c268ec97ed788a1c1 (diff) | |
| parent | 1fdf6048f45bf64fbdd4a74ebe40ec45ff06d016 (diff) | |
| download | openshift-05a9c91735cc95457411dbb19951341e5418df18.tar.gz openshift-05a9c91735cc95457411dbb19951341e5418df18.tar.bz2 openshift-05a9c91735cc95457411dbb19951341e5418df18.tar.xz openshift-05a9c91735cc95457411dbb19951341e5418df18.zip | |
Merge pull request #4988 from stevekuznetsov/skuznets/tolerate-3.7
Update version checks to tolerate 3.7
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 8 |
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..844d77255 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 = False 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' |