diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-28 13:43:17 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-28 13:43:17 -0500 |
| commit | 14718afef1cc79b4d41f490be677caf3e4191e2b (patch) | |
| tree | 6d956420231f2bbbb0fc209753edc78e15cd9434 /nova/flags.py | |
| parent | cff74a76e6369989e8006aa9d7c20fde14b31952 (diff) | |
| parent | c3c86f994413792cf582df86cf5e16f788005bed (diff) | |
| download | nova-14718afef1cc79b4d41f490be677caf3e4191e2b.tar.gz nova-14718afef1cc79b4d41f490be677caf3e4191e2b.tar.xz nova-14718afef1cc79b4d41f490be677caf3e4191e2b.zip | |
Merge from trunk and resolving conflicts
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py index c2259433f..69ef24962 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -298,10 +298,14 @@ DEFINE_string('ec2_dmz_host', '$my_ip', 'internal ip of api server') DEFINE_integer('ec2_port', 8773, 'cloud controller port') DEFINE_string('ec2_scheme', 'http', 'prefix for ec2') DEFINE_string('ec2_path', '/services/Cloud', 'suffix for ec2') +DEFINE_string('osapi_extensions_path', '/var/lib/nova/extensions', + 'default directory for nova extensions') DEFINE_string('osapi_host', '$my_ip', 'ip of api server') DEFINE_string('osapi_scheme', 'http', 'prefix for openstack') DEFINE_integer('osapi_port', 8774, 'OpenStack API port') DEFINE_string('osapi_path', '/v1.0/', 'suffix for openstack') +DEFINE_integer('osapi_max_limit', 1000, + 'max number of items returned in a collection response') DEFINE_string('default_project', 'openstack', 'default project for openstack') DEFINE_string('default_image', 'ami-11111', @@ -321,6 +325,8 @@ DEFINE_integer('auth_token_ttl', 3600, 'Seconds for auth tokens to linger') DEFINE_string('state_path', os.path.join(os.path.dirname(__file__), '../'), "Top-level directory for maintaining nova's state") +DEFINE_string('lock_path', os.path.join(os.path.dirname(__file__), '../'), + "Directory for lock files") DEFINE_string('logdir', None, 'output to a per-service log file in named ' 'directory') @@ -346,7 +352,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.s3.S3ImageService', +DEFINE_string('image_service', 'nova.image.local.LocalImageService', 'The service to use for retrieving and searching for images.') DEFINE_string('host', socket.gethostname(), @@ -358,3 +364,7 @@ DEFINE_string('node_availability_zone', 'nova', DEFINE_string('notification_driver', 'nova.notifier.no_op_notifier.NoopNotifier', 'Default driver for sending notifications') +DEFINE_string('zone_name', 'nova', 'name of this zone') +DEFINE_list('zone_capabilities', + ['hypervisor=xenserver;kvm', 'os=linux;windows'], + 'Key/Multi-value list representng capabilities of this zone') |