summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-09 16:18:22 -0400
committerGitHub <noreply@github.com>2016-08-09 16:18:22 -0400
commit4a87e79b695c08392cebc20135a2e38300863d18 (patch)
treef47ee6f09559eb9968f502bee740586608dc2186
parentb2c6abedc546c70617b7065396ad16013a0f4f50 (diff)
parent9f8a5e5aaf5877943b0934dd8f2cda5394ba1e89 (diff)
downloadopenshift-4a87e79b695c08392cebc20135a2e38300863d18.tar.gz
openshift-4a87e79b695c08392cebc20135a2e38300863d18.tar.bz2
openshift-4a87e79b695c08392cebc20135a2e38300863d18.tar.xz
openshift-4a87e79b695c08392cebc20135a2e38300863d18.zip
Merge pull request #2279 from abutcher/no-volume-zone
Bug 1365379 - Need to have 'NoVolumeZoneConflict' scheduler policy enabled by installer
-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 659f4eba6..f89087aea 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1708,6 +1708,7 @@ class OpenShiftFacts(object):
{"name": "PodFitsResources"},
{"name": "PodFitsPorts"},
{"name": "NoDiskConflict"},
+ {"name": "NoVolumeZoneConflict"},
{"name": "Region", "argument": {"serviceAffinity" : {"labels" : ["region"]}}}
]
scheduler_priorities = [