summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-16 15:49:10 -0400
committerGitHub <noreply@github.com>2016-09-16 15:49:10 -0400
commite092de714dc09a86a0ff26c648eec2033a3b9952 (patch)
tree36098f2ffd63f381364d019cf27a7a9c04e3932a
parentdee623685d08a6afcfde95f417c4aeb06c979b50 (diff)
parent8e3108bcfe7ad51b2cf970a3b4a8ffc0f4060da4 (diff)
downloadopenshift-e092de714dc09a86a0ff26c648eec2033a3b9952.tar.gz
openshift-e092de714dc09a86a0ff26c648eec2033a3b9952.tar.bz2
openshift-e092de714dc09a86a0ff26c648eec2033a3b9952.tar.xz
openshift-e092de714dc09a86a0ff26c648eec2033a3b9952.zip
Merge pull request #2457 from abutcher/bz1370707
Add 'MaxGCEPDVolumeCount' 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 e5cb0db15..bdc7d3947 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1731,6 +1731,7 @@ class OpenShiftFacts(object):
{"name": "NoDiskConflict"},
{"name": "NoVolumeZoneConflict"},
{"name": "MaxEBSVolumeCount"},
+ {"name": "MaxGCEPDVolumeCount"},
{"name": "Region", "argument": {"serviceAffinity" : {"labels" : ["region"]}}}
]
scheduler_priorities = [