From 9b6f24f271e0776f68073f72a10fb9f83d264cee Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Wed, 7 Dec 2016 15:36:42 -0500 Subject: Properly handle x.y.z formatted versions for openshift_release --- .../lookup_plugins/openshift_master_facts_default_predicates.py | 1 + .../lookup_plugins/openshift_master_facts_default_priorities.py | 1 + 2 files changed, 2 insertions(+) (limited to 'roles/openshift_master_facts/lookup_plugins') 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]) -- cgit v1.2.3 From d38303c7cfc7c6d946922df696f5422bb2a32dc5 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Wed, 7 Dec 2016 16:15:16 -0500 Subject: Remove Hostname from 1.1 and 1.2 predicates --- .../lookup_plugins/openshift_master_facts_default_predicates.py | 1 - 1 file changed, 1 deletion(-) (limited to 'roles/openshift_master_facts/lookup_plugins') 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 6255ef6eb..4f7461827 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 @@ -65,7 +65,6 @@ class LookupModule(LookupBase): if short_version in ['1.1', '1.2']: predicates.append({'name': 'MatchNodeSelector'}) - predicates.append({'name': 'Hostname'}) if short_version != '1.1': predicates.append({'name': 'MaxEBSVolumeCount'}) -- cgit v1.2.3