summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-24 16:18:29 -0500
committerGitHub <noreply@github.com>2017-02-24 16:18:29 -0500
commit77c7b1c264f6a023a61a0656899bc2121921a03c (patch)
tree1facd0de34decb86bc738a6c3f61ea5c9bd5fe1f /roles/openshift_facts
parenta46b63f8dd276a46de61127d529d108349c6fad0 (diff)
parent659826a2254f36ad06aa61c178b76410cc6d1995 (diff)
downloadopenshift-77c7b1c264f6a023a61a0656899bc2121921a03c.tar.gz
openshift-77c7b1c264f6a023a61a0656899bc2121921a03c.tar.bz2
openshift-77c7b1c264f6a023a61a0656899bc2121921a03c.tar.xz
openshift-77c7b1c264f6a023a61a0656899bc2121921a03c.zip
Merge pull request #3448 from smarterclayton/version
Prepare for origin moving to OCP version scheme
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')