diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-05 09:09:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 09:09:24 -0400 |
| commit | 265b20d24a2b8ae2059d68c59c8508fbe23ff7df (patch) | |
| tree | cbf836f917cf45bf976525879cbb681d25424884 /roles/openshift_facts/library | |
| parent | 34f5de4185b0ae475367e9316a44bdf58fce1dc9 (diff) | |
| parent | f5d0e45f3829c489ec5d59511a1cca2188dcd955 (diff) | |
| download | openshift-265b20d24a2b8ae2059d68c59c8508fbe23ff7df.tar.gz openshift-265b20d24a2b8ae2059d68c59c8508fbe23ff7df.tar.bz2 openshift-265b20d24a2b8ae2059d68c59c8508fbe23ff7df.tar.xz openshift-265b20d24a2b8ae2059d68c59c8508fbe23ff7df.zip | |
Merge pull request #2108 from sdodson/prepare-v13
Prepare for v1.3
Diffstat (limited to 'roles/openshift_facts/library')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index a5ccfb152..364e54f58 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -832,19 +832,26 @@ def set_version_facts_if_unset(facts): version_gte_3_1_or_1_1 = LooseVersion(version) >= LooseVersion('1.1.0') version_gte_3_1_1_or_1_1_1 = LooseVersion(version) >= LooseVersion('1.1.1') version_gte_3_2_or_1_2 = LooseVersion(version) >= LooseVersion('1.2.0') + version_gte_3_3_or_1_3 = LooseVersion(version) >= LooseVersion('1.3.0') else: version_gte_3_1_or_1_1 = LooseVersion(version) >= LooseVersion('3.0.2.905') version_gte_3_1_1_or_1_1_1 = LooseVersion(version) >= LooseVersion('3.1.1') version_gte_3_2_or_1_2 = LooseVersion(version) >= LooseVersion('3.1.1.901') + version_gte_3_3_or_1_3 = LooseVersion(version) >= LooseVersion('3.3.0') else: version_gte_3_1_or_1_1 = True version_gte_3_1_1_or_1_1_1 = True version_gte_3_2_or_1_2 = True + version_gte_3_3_or_1_3 = 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 + facts['common']['version_gte_3_3_or_1_3'] = version_gte_3_3_or_1_3 - if version_gte_3_2_or_1_2: + + if version_gte_3_3_or_1_3: + examples_content_version = 'v1.3' + elif version_gte_3_2_or_1_2: examples_content_version = 'v1.2' elif version_gte_3_1_or_1_1: examples_content_version = 'v1.1' |