diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-22 13:26:36 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-09-22 13:26:36 +0200 |
| commit | d42e168763d232476407a07b79056fb745c6075e (patch) | |
| tree | 25e98655b2fcf9a05ecc832ee17e0c1d9e7f2221 /nova/flags.py | |
| parent | 28336ed41e0d44d7600588a6014f6253e4b87a42 (diff) | |
| parent | 4e727faf450154d89687b1a33dae2159d5b691a0 (diff) | |
| download | nova-d42e168763d232476407a07b79056fb745c6075e.tar.gz nova-d42e168763d232476407a07b79056fb745c6075e.tar.xz nova-d42e168763d232476407a07b79056fb745c6075e.zip | |
Merge trunk
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index 7b0c95a3c..6a1c14490 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -167,10 +167,14 @@ def DECLARE(name, module_string, flag_values=FLAGS): # Define any app-specific flags in their own files, docs at: # http://code.google.com/p/python-gflags/source/browse/trunk/gflags.py#39 +DEFINE_list('region_list', + [], + 'list of region=url pairs separated by commas') 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 +217,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') |