summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorClayton Coleman <ccoleman@redhat.com>2017-02-21 21:47:25 -0500
committerClayton Coleman <ccoleman@redhat.com>2017-02-23 13:59:43 -0500
commit659826a2254f36ad06aa61c178b76410cc6d1995 (patch)
treef2b6c211a91bfe05dda053539286e87300a86c68 /roles/openshift_facts
parentbb7985f751eab9c9e987e85f00a1918f0f9594c8 (diff)
downloadopenshift-659826a2254f36ad06aa61c178b76410cc6d1995.tar.gz
openshift-659826a2254f36ad06aa61c178b76410cc6d1995.tar.bz2
openshift-659826a2254f36ad06aa61c178b76410cc6d1995.tar.xz
openshift-659826a2254f36ad06aa61c178b76410cc6d1995.zip
Prepare for origin moving to OCP version scheme
Origin 1.6 and future releases will be versioned as Origin 3.6+. This unifies a point of inconsistency and brings Origin in line with the full release history. Update version numbers to match that 3.x is preferred.
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 2503d6212..32bbbc30a 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -875,7 +875,7 @@ def set_version_facts_if_unset(facts):
version_gte_3_3_or_1_3 = version >= LooseVersion('1.3.0')
version_gte_3_4_or_1_4 = version >= LooseVersion('1.4.0')
version_gte_3_5_or_1_5 = version >= LooseVersion('1.5.0')
- version_gte_3_6_or_1_6 = version >= LooseVersion('1.6.0')
+ version_gte_3_6_or_1_6 = version >= LooseVersion('3.6.0') or version >= LooseVersion('1.6.0')
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')