summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-12-02 16:21:49 +0000
committerGerrit Code Review <review@openstack.org>2011-12-02 16:21:49 +0000
commit7fc79c41e9759310faf5a88f28981f0efb53d431 (patch)
treee3de58fc498571a007043050d0ff911905c609d6 /nova
parentab215c42a2a31c8b4a6aa455911535183ab931af (diff)
parent3b29258ed305993789070f2d1cc987d76a432f6b (diff)
downloadnova-7fc79c41e9759310faf5a88f28981f0efb53d431.tar.gz
nova-7fc79c41e9759310faf5a88f28981f0efb53d431.tar.xz
nova-7fc79c41e9759310faf5a88f28981f0efb53d431.zip
Merge "Updates simple scheduler to allow strict availability_zone scheduling"
Diffstat (limited to 'nova')
-rw-r--r--nova/scheduler/simple.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py
index 050edf3f5..6fed16841 100644
--- a/nova/scheduler/simple.py
+++ b/nova/scheduler/simple.py
@@ -34,6 +34,8 @@ flags.DEFINE_integer("max_gigabytes", 10000,
"maximum number of volume gigabytes to allow per host")
flags.DEFINE_integer("max_networks", 1000,
"maximum number of networks to allow per host")
+flags.DEFINE_string('default_schedule_zone', None,
+ 'zone to use when user doesnt specify one')
class SimpleScheduler(chance.ChanceScheduler):
@@ -45,7 +47,7 @@ class SimpleScheduler(chance.ChanceScheduler):
availability_zone = instance_opts.get('availability_zone')
- zone, host = None, None
+ zone, host = FLAGS.default_schedule_zone, None
if availability_zone:
zone, _x, host = availability_zone.partition(':')