x/gantt
Code Issues Proposed changes

Merge "Updates simple scheduler to allow strict availability_zone scheduling"

Browse Source
This commit is contained in:
Jenkins
2011-12-02 16:21:49 +00:00
committed by Gerrit Code Review
parent 473fb20949 dc224fa34d
commit b9788a5997
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Authors
View File

@@ -68,6 +68,7 @@ John Tran <jtran@attinteractive.com>
Jonathan Bryce <jbryce@jbryce.com> Jonathan Bryce <jbryce@jbryce.com>
Jordan Rinke <jordan@openstack.org> Jordan Rinke <jordan@openstack.org>
Joseph Suh <jsuh@isi.edu> Joseph Suh <jsuh@isi.edu>
Joseph W. Breu <breu@breu.org>
Josh Durgin <joshd@hq.newdream.net> Josh Durgin <joshd@hq.newdream.net>
Josh Kearney <josh@jk0.org> Josh Kearney <josh@jk0.org>
Josh Kleinpeter <josh@kleinpeter.org> Josh Kleinpeter <josh@kleinpeter.org>
@@ -133,6 +134,7 @@ Vasiliy Shlykov <vash@vasiliyshlykov.org>
Vishvananda Ishaya <vishvananda@gmail.com> Vishvananda Ishaya <vishvananda@gmail.com>
Vivek Y S <vivek.ys@gmail.com> Vivek Y S <vivek.ys@gmail.com>
Vladimir Popovski <vladimir@zadarastorage.com> Vladimir Popovski <vladimir@zadarastorage.com>
William Kelly <william.kelly@rackspace.com>
William Wolf <throughnothing@gmail.com> William Wolf <throughnothing@gmail.com>
Yoshiaki Tamura <yoshi@midokura.jp> Yoshiaki Tamura <yoshi@midokura.jp>
Youcef Laribi <Youcef.Laribi@eu.citrix.com> Youcef Laribi <Youcef.Laribi@eu.citrix.com>

4
nova/scheduler/simple.py
View File

@@ -34,6 +34,8 @@ flags.DEFINE_integer("max_gigabytes", 10000,
"maximum number of volume gigabytes to allow per host") "maximum number of volume gigabytes to allow per host")
flags.DEFINE_integer("max_networks", 1000, flags.DEFINE_integer("max_networks", 1000,
"maximum number of networks to allow per host") "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): class SimpleScheduler(chance.ChanceScheduler):
@@ -45,7 +47,7 @@ class SimpleScheduler(chance.ChanceScheduler):
availability_zone = instance_opts.get('availability_zone') availability_zone = instance_opts.get('availability_zone')
zone, host = None, None zone, host = FLAGS.default_schedule_zone, None
if availability_zone: if availability_zone:
zone, _x, host = availability_zone.partition(':') zone, _x, host = availability_zone.partition(':')