diff options
| author | Scott Dodson <sdodson@redhat.com> | 2018-02-06 21:53:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 21:53:36 -0500 |
| commit | 4829d3b280801ae4b8530d2de29fdcf5328e26cb (patch) | |
| tree | e898397bb84473626918e4731f9cb7a52c57f5d2 /roles/openshift_facts | |
| parent | 9cdf6e8a3dc1d4ff399e3d85fe7e8b6d38ab92a4 (diff) | |
| parent | 5402ff05c7f5695bbe60cb6966e57a038c4fe1c0 (diff) | |
| download | openshift-4829d3b280801ae4b8530d2de29fdcf5328e26cb.tar.gz openshift-4829d3b280801ae4b8530d2de29fdcf5328e26cb.tar.bz2 openshift-4829d3b280801ae4b8530d2de29fdcf5328e26cb.tar.xz openshift-4829d3b280801ae4b8530d2de29fdcf5328e26cb.zip | |
Merge pull request #7015 from sdodson/v310
Initial support for 3.10
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 452cc4ef6..11a51b6bb 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -564,18 +564,23 @@ def set_version_facts_if_unset(facts): version_gte_3_7 = version >= LooseVersion('3.7') version_gte_3_8 = version >= LooseVersion('3.8') version_gte_3_9 = version >= LooseVersion('3.9') + version_gte_3_10 = version >= LooseVersion('3.10') else: # 'Latest' version is set to True, 'Next' versions set to False version_gte_3_6 = True version_gte_3_7 = True version_gte_3_8 = False version_gte_3_9 = False + version_gte_3_10 = False facts['common']['version_gte_3_6'] = version_gte_3_6 facts['common']['version_gte_3_7'] = version_gte_3_7 facts['common']['version_gte_3_8'] = version_gte_3_8 facts['common']['version_gte_3_9'] = version_gte_3_9 + facts['common']['version_gte_3_10'] = version_gte_3_10 - if version_gte_3_9: + if version_gte_3_10: + examples_content_version = 'v3.10' + elif version_gte_3_9: examples_content_version = 'v3.9' elif version_gte_3_8: examples_content_version = 'v3.8' |