diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-02 16:21:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-02 16:21:49 +0000 |
| commit | 7fc79c41e9759310faf5a88f28981f0efb53d431 (patch) | |
| tree | e3de58fc498571a007043050d0ff911905c609d6 | |
| parent | ab215c42a2a31c8b4a6aa455911535183ab931af (diff) | |
| parent | 3b29258ed305993789070f2d1cc987d76a432f6b (diff) | |
| download | nova-7fc79c41e9759310faf5a88f28981f0efb53d431.tar.gz nova-7fc79c41e9759310faf5a88f28981f0efb53d431.tar.xz nova-7fc79c41e9759310faf5a88f28981f0efb53d431.zip | |
Merge "Updates simple scheduler to allow strict availability_zone scheduling"
| -rw-r--r-- | Authors | 2 | ||||
| -rw-r--r-- | nova/scheduler/simple.py | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -68,6 +68,7 @@ John Tran <jtran@attinteractive.com> Jonathan Bryce <jbryce@jbryce.com> Jordan Rinke <jordan@openstack.org> Joseph Suh <jsuh@isi.edu> +Joseph W. Breu <breu@breu.org> Josh Durgin <joshd@hq.newdream.net> Josh Kearney <josh@jk0.org> Josh Kleinpeter <josh@kleinpeter.org> @@ -133,6 +134,7 @@ Vasiliy Shlykov <vash@vasiliyshlykov.org> Vishvananda Ishaya <vishvananda@gmail.com> Vivek Y S <vivek.ys@gmail.com> Vladimir Popovski <vladimir@zadarastorage.com> +William Kelly <william.kelly@rackspace.com> William Wolf <throughnothing@gmail.com> Yoshiaki Tamura <yoshi@midokura.jp> Youcef Laribi <Youcef.Laribi@eu.citrix.com> 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(':') |