summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-15 10:38:51 -0400
committerGitHub <noreply@github.com>2016-09-15 10:38:51 -0400
commit37326d031d49bf598fd7daaf305d5687e879faff (patch)
tree78c9405ff365f8bb8a7f7cf333bd82b95073b7dd
parentb85045bb0df6df6f9468f4994047efb91ce47d2f (diff)
parent466a45abc175e49573bebd91a6290d75e3970efc (diff)
downloadopenshift-37326d031d49bf598fd7daaf305d5687e879faff.tar.gz
openshift-37326d031d49bf598fd7daaf305d5687e879faff.tar.bz2
openshift-37326d031d49bf598fd7daaf305d5687e879faff.tar.xz
openshift-37326d031d49bf598fd7daaf305d5687e879faff.zip
Merge pull request #2452 from abutcher/max-ebs-volume-count
Add 'MaxEBSVolumeCount' to default scheduler predicates.
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index ebd799466..e5cb0db15 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1730,6 +1730,7 @@ class OpenShiftFacts(object):
{"name": "PodFitsPorts"},
{"name": "NoDiskConflict"},
{"name": "NoVolumeZoneConflict"},
+ {"name": "MaxEBSVolumeCount"},
{"name": "Region", "argument": {"serviceAffinity" : {"labels" : ["region"]}}}
]
scheduler_priorities = [