summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-07-20 10:14:27 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-07-20 10:14:27 -0400
commitdd186e74e05713a4337ebedbbbc77c4293d9cb3a (patch)
treeafed08e3c5ae351a650c44bdcf0ffa3d7f687bbd /roles/openshift_master/templates
parent420c7891d7355038e7236f843c87a0d17bb7474f (diff)
parentb5d8fabbc9780a050d004231e63ccb7c1a46d199 (diff)
downloadopenshift-dd186e74e05713a4337ebedbbbc77c4293d9cb3a.tar.gz
openshift-dd186e74e05713a4337ebedbbbc77c4293d9cb3a.tar.bz2
openshift-dd186e74e05713a4337ebedbbbc77c4293d9cb3a.tar.xz
openshift-dd186e74e05713a4337ebedbbbc77c4293d9cb3a.zip
Merge pull request #362 from sdodson/issue361
Issue361 - MatchNodeSelector should be first
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/scheduler.json.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/scheduler.json.j2 b/roles/openshift_master/templates/scheduler.json.j2
index 833e7f3e1..835f2383e 100644
--- a/roles/openshift_master/templates/scheduler.json.j2
+++ b/roles/openshift_master/templates/scheduler.json.j2
@@ -1,5 +1,6 @@
{
"predicates": [
+ {"name": "MatchNodeSelector"},
{"name": "PodFitsResources"},
{"name": "PodFitsPorts"},
{"name": "NoDiskConflict"},