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 - .../test/openshift_master_facts_default_predicates_tests.py | 2 -- 2 files changed, 3 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 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'}) 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 8e4037da4..c95356908 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 @@ -14,7 +14,6 @@ DEFAULT_PREDICATES_1_1 = [ {'name': 'PodFitsResources'}, {'name': 'NoDiskConflict'}, {'name': 'MatchNodeSelector'}, - {'name': 'Hostname'} ] DEFAULT_PREDICATES_1_2 = [ @@ -23,7 +22,6 @@ DEFAULT_PREDICATES_1_2 = [ {'name': 'NoDiskConflict'}, {'name': 'NoVolumeZoneConflict'}, {'name': 'MatchNodeSelector'}, - {'name': 'Hostname'}, {'name': 'MaxEBSVolumeCount'}, {'name': 'MaxGCEPDVolumeCount'} ] -- cgit v1.2.1