diff options
author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-20 19:17:36 -0700 |
---|---|---|
committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-20 19:17:36 -0700 |
commit | 026f6f2b7f5457f15a258ebed66bb8dda3263eec (patch) | |
tree | 146dcfe5e69bd4c7bea76e46fa97fbeb39828581 /nova/flags.py | |
parent | c791229d11e3baf2a5828ee8efe98ed827a35dde (diff) | |
parent | d8861d04a85044ae57ffd7eb9ab682879beecf7d (diff) | |
download | nova-026f6f2b7f5457f15a258ebed66bb8dda3263eec.tar.gz nova-026f6f2b7f5457f15a258ebed66bb8dda3263eec.tar.xz nova-026f6f2b7f5457f15a258ebed66bb8dda3263eec.zip |
merged trunk
Diffstat (limited to 'nova/flags.py')
-rw-r--r-- | nova/flags.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index 7b0c95a3c..ed0baee65 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -171,6 +171,7 @@ DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake') DEFINE_integer('s3_port', 3333, 's3 port') DEFINE_string('s3_host', '127.0.0.1', 's3 host') DEFINE_string('compute_topic', 'compute', 'the topic compute nodes listen on') +DEFINE_string('scheduler_topic', 'scheduler', 'the topic scheduler nodes listen on') DEFINE_string('volume_topic', 'volume', 'the topic volume nodes listen on') DEFINE_string('network_topic', 'network', 'the topic network nodes listen on') @@ -213,6 +214,8 @@ DEFINE_string('network_manager', 'nova.network.manager.VlanManager', 'Manager for network') DEFINE_string('volume_manager', 'nova.volume.manager.AOEManager', 'Manager for volume') +DEFINE_string('scheduler_manager', 'nova.scheduler.manager.SchedulerManager', + 'Manager for scheduler') DEFINE_string('host', socket.gethostname(), 'name of this node') |