diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-13 19:19:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-13 19:19:46 +0000 |
| commit | 6c898e6abf44caa176790e9cd4505aeed145397c (patch) | |
| tree | 4d9cbc1ef13d8d208284417f333e36482bdd8c26 /nova/flags.py | |
| parent | 485328e48fc7dff1ce2ebfd262c442d8f993688b (diff) | |
| parent | 60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf (diff) | |
| download | nova-6c898e6abf44caa176790e9cd4505aeed145397c.tar.gz nova-6c898e6abf44caa176790e9cd4505aeed145397c.tar.xz nova-6c898e6abf44caa176790e9cd4505aeed145397c.zip | |
Merge "Implements blueprint separate-nova-volumeapi"
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nova/flags.py b/nova/flags.py index a51508c97..b566f303a 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -309,19 +309,21 @@ DEFINE_integer('rabbit_max_retries', 0, 'maximum rabbit connection attempts (0=try forever)') DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to') DEFINE_boolean('rabbit_durable_queues', False, 'use durable queues') -DEFINE_list('enabled_apis', ['ec2', 'osapi', 'metadata'], +DEFINE_list('enabled_apis', + ['ec2', 'osapi_compute', 'osapi_volume', 'metadata'], 'list of APIs to enable by default') DEFINE_string('ec2_host', '$my_ip', 'ip of api server') 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_multistring('osapi_extension', - ['nova.api.openstack.v2.contrib.standard_extensions'], - 'osapi extension to load') -DEFINE_string('osapi_host', '$my_ip', 'ip of api server') +DEFINE_multistring('osapi_compute_extension', + ['nova.api.openstack.compute.contrib.standard_extensions'], + 'osapi compute extension to load') +DEFINE_multistring('osapi_volume_extension', + ['nova.api.openstack.volume.contrib.standard_extensions'], + 'osapi volume extension to load') DEFINE_string('osapi_scheme', 'http', 'prefix for openstack') -DEFINE_integer('osapi_port', 8774, 'OpenStack API port') DEFINE_string('osapi_path', '/v1.1/', 'suffix for openstack') DEFINE_integer('osapi_max_limit', 1000, 'max number of items returned in a collection response') |