summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-12-07 16:15:16 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-12-07 17:12:11 -0500
commitd38303c7cfc7c6d946922df696f5422bb2a32dc5 (patch)
tree7979ce287698061b19339b2fc9d32c3b3e7b24e3 /roles
parent9b6f24f271e0776f68073f72a10fb9f83d264cee (diff)
downloadopenshift-d38303c7cfc7c6d946922df696f5422bb2a32dc5.tar.gz
openshift-d38303c7cfc7c6d946922df696f5422bb2a32dc5.tar.bz2
openshift-d38303c7cfc7c6d946922df696f5422bb2a32dc5.tar.xz
openshift-d38303c7cfc7c6d946922df696f5422bb2a32dc5.zip
Remove Hostname from 1.1 and 1.2 predicates
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py1
-rw-r--r--roles/openshift_master_facts/test/openshift_master_facts_default_predicates_tests.py2
2 files changed, 0 insertions, 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'}
]