diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-08 10:16:42 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-08 10:16:42 -0300 |
commit | 7480a0e06a9a1da029c6564e1e4d7ef60131e6e2 (patch) | |
tree | 731b1c213bed675608c6e76452a0d4ed415f4416 /roles/openshift_facts | |
parent | c1728c8847177988e4532b9c9c777e1a23223410 (diff) | |
parent | 6ec757e4449fbc59f509f980bd9423bdb35412eb (diff) | |
download | openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.gz openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.bz2 openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.tar.xz openshift-7480a0e06a9a1da029c6564e1e4d7ef60131e6e2.zip |
Merge branch 'aoi-32-up' into upgrade33
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 66ad74cab..135224c16 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' @@ -1757,6 +1764,7 @@ class OpenShiftFacts(object): if version_info is not None: docker['api_version'] = version_info['api_version'] docker['version'] = version_info['version'] + docker['gte_1_10'] = LooseVersion(version_info['version']) >= LooseVersion('1.10') defaults['docker'] = docker if 'clock' in roles: |