diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-07-20 10:14:27 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-07-20 10:14:27 -0400 |
| commit | dd186e74e05713a4337ebedbbbc77c4293d9cb3a (patch) | |
| tree | afed08e3c5ae351a650c44bdcf0ffa3d7f687bbd /roles/openshift_master | |
| parent | 420c7891d7355038e7236f843c87a0d17bb7474f (diff) | |
| parent | b5d8fabbc9780a050d004231e63ccb7c1a46d199 (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/openshift_master/templates/scheduler.json.j2 | 1 |
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"}, |