summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-12-07 15:36:42 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-12-07 15:36:42 -0500
commit9b6f24f271e0776f68073f72a10fb9f83d264cee (patch)
tree1b88e3641a713a7a34ae793f285a5f002d34c540
parent4a720359613da16a9cd4ed547dddccee14735aa0 (diff)
downloadopenshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.gz
openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.bz2
openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.tar.xz
openshift-9b6f24f271e0776f68073f72a10fb9f83d264cee.zip
Properly handle x.y.z formatted versions for openshift_release
-rw-r--r--roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py1
-rw-r--r--roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py1
-rw-r--r--roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py5
-rw-r--r--roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py5
4 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py
index 6aa9af74c..6255ef6eb 100644
--- a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py
+++ b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py
@@ -32,6 +32,7 @@ class LookupModule(LookupBase):
short_version = release[1:]
else:
short_version = release
+ short_version = '.'.join(short_version.split('.')[0:2])
elif 'openshift_version' in variables:
version = variables['openshift_version']
short_version = '.'.join(version.split('.')[0:2])
diff --git a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py
index 7c0ba4388..7087ff03c 100644
--- a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py
+++ b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_priorities.py
@@ -36,6 +36,7 @@ class LookupModule(LookupBase):
short_version = release[1:]
else:
short_version = release
+ short_version = '.'.join(short_version.split('.')[0:2])
elif 'openshift_version' in variables:
version = variables['openshift_version']
short_version = '.'.join(version.split('.')[0:2])
diff --git a/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py b/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py
index 0428ad465..8e4037da4 100644
--- a/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py
+++ b/roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py
@@ -211,6 +211,11 @@ class TestOpenShiftMasterFactsDefaultPredicates(object):
for release, deployment_type, default_predicates in TEST_VARS:
yield self.check_defaults_deployment_type_kwarg, release, deployment_type, default_predicates, regions_enabled
+ def test_trunc_openshift_release(self):
+ for release, deployment_type, default_predicates in TEST_VARS:
+ release = release + '.1'
+ yield self.check_defaults_release, release, deployment_type, default_predicates, False
+
@raises(AnsibleError)
def test_unknown_deployment_types(self):
facts = copy.deepcopy(self.default_facts)
diff --git a/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py b/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
index a13b546d1..5427a07a1 100644
--- a/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
+++ b/roles/openshift_master_facts/test/openshift_master_facts_default_priorities_tests.py
@@ -200,6 +200,11 @@ class TestOpenShiftMasterFactsDefaultPredicates(object):
for short_version, deployment_type, default_priorities in TEST_VARS:
yield self.check_defaults_short_version_kwarg, short_version, deployment_type, default_priorities, zones_enabled
+ def test_trunc_openshift_release(self):
+ for release, deployment_type, default_priorities in TEST_VARS:
+ release = release + '.1'
+ yield self.check_defaults_release, release, deployment_type, default_priorities, False
+
@raises(AnsibleError)
def test_unknown_origin_version(self):
facts = copy.deepcopy(self.default_facts)