diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-11-29 13:14:26 +0100 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-11-29 13:14:26 +0100 |
| commit | c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f (patch) | |
| tree | 15a73446e1daa6829a68e05a3cef862924428473 /nova/flags.py | |
| parent | b65b41e5957d5ded516343b3611292c9744d169f (diff) | |
| parent | 4f92d1d39fcfda4dad73e6e0339351f0d7d00d61 (diff) | |
| download | nova-c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f.tar.gz nova-c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f.tar.xz nova-c5d3e310376b3fb5c548e1d2e70c5ce7a489bb9f.zip | |
Merge trunk.
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py index 2b8bbbdb7..70a049491 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -194,6 +194,8 @@ DEFINE_list('region_list', [], 'list of region=url pairs separated by commas') DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake') +DEFINE_string('aws_access_key_id', 'admin', 'AWS Access ID') +DEFINE_string('aws_secret_access_key', 'admin', 'AWS Access Key') 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') @@ -211,6 +213,8 @@ DEFINE_integer('rabbit_port', 5672, 'rabbit port') DEFINE_string('rabbit_userid', 'guest', 'rabbit userid') DEFINE_string('rabbit_password', 'guest', 'rabbit password') DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host') +DEFINE_integer('rabbit_retry_interval', 10, 'rabbit connection retry interval') +DEFINE_integer('rabbit_max_retries', 12, 'rabbit connection attempts') DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to') DEFINE_string('cc_host', '127.0.0.1', 'ip of api server') DEFINE_integer('cc_port', 8773, 'cloud controller port') @@ -250,7 +254,7 @@ DEFINE_string('scheduler_manager', 'nova.scheduler.manager.SchedulerManager', 'Manager for scheduler') # The service to use for image search and retrieval -DEFINE_string('image_service', 'nova.image.service.LocalImageService', +DEFINE_string('image_service', 'nova.image.local.LocalImageService', 'The service to use for retrieving and searching for images.') DEFINE_string('host', socket.gethostname(), |