diff options
| author | Ryan Lane <laner@controller> | 2010-11-24 15:46:22 +0000 |
|---|---|---|
| committer | Ryan Lane <laner@controller> | 2010-11-24 15:46:22 +0000 |
| commit | 7d462fd04cf799689bcbea0b926f0bd38e64869c (patch) | |
| tree | 1e032a18194694783dfe5475a782a56a75c746d0 /nova/flags.py | |
| parent | ebffd9cb35af4257a085f85abf64e0c2baf31ff0 (diff) | |
| parent | 6e349f6ea1846c104f620aa68a26cfc753e8977d (diff) | |
| download | nova-7d462fd04cf799689bcbea0b926f0bd38e64869c.tar.gz nova-7d462fd04cf799689bcbea0b926f0bd38e64869c.tar.xz nova-7d462fd04cf799689bcbea0b926f0bd38e64869c.zip | |
Merge from main branch
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py index f3b0384ad..f7ae26050 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -138,6 +138,8 @@ class FlagValues(gflags.FlagValues): FLAGS = FlagValues() +gflags.FLAGS = FLAGS +gflags.DEFINE_flag(gflags.HelpFlag(), FLAGS) def _wrapper(func): @@ -177,6 +179,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') @@ -194,6 +198,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') @@ -224,13 +230,13 @@ DEFINE_string('compute_manager', 'nova.compute.manager.ComputeManager', 'Manager for compute') DEFINE_string('network_manager', 'nova.network.manager.VlanManager', 'Manager for network') -DEFINE_string('volume_manager', 'nova.volume.manager.AOEManager', +DEFINE_string('volume_manager', 'nova.volume.manager.VolumeManager', 'Manager for volume') 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(), |