diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2012-01-09 14:02:02 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2012-01-13 09:06:55 -0800 |
| commit | 60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf (patch) | |
| tree | f3764b8c1f7d4247ad9bf653643e60e1b68fffb7 /nova/common | |
| parent | 26de3426d471c447cef1bd8a1129027821136241 (diff) | |
| download | nova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.tar.gz nova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.tar.xz nova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.zip | |
Implements blueprint separate-nova-volumeapi
* Moves openstack/v2 directory to compute and fixes tests accordingly
* Moves some code from api/openstack/compute to shared location, for use by volume api
* Implements basic volume functionality for types, volumes, and snapshots
* Changes service name from osapi to osapi_compute (and adds osapi_volume)
* Renames nova-api-os to nova-api-os-compute, adds nove-api-os-volume
* Separate extension mechanism for compute and volume
** Removes flag osapi_extension and replaces with osapi_compute_extension and osapi_volume_extension
* Updates the paste config
* Fixes setup.py to include nova-os-api-compute and nova-os-api-volume
* Fix bug in volume version code that occurred as result of trunk merge
* Update integrated/test_volumes.py to use new endpoint
Change-Id: I4c2e57c3cafd4e1a9e2ff3ce201c8cf28326afcd
Diffstat (limited to 'nova/common')
| -rw-r--r-- | nova/common/cfg.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/common/cfg.py b/nova/common/cfg.py index 58d17d99f..bfb7b8a19 100644 --- a/nova/common/cfg.py +++ b/nova/common/cfg.py @@ -32,14 +32,14 @@ Options can be strings, integers, floats, booleans, lists or 'multi strings': enabled_apis_opt = \ cfg.ListOpt('enabled_apis', - default=['ec2', 'osapi'], + default=['ec2', 'osapi_compute'], help='List of APIs to enable by default') DEFAULT_EXTENSIONS = [ 'nova.api.openstack.contrib.standard_extensions' ] - osapi_extension_opt = \ - cfg.MultiStrOpt('osapi_extension', + osapi_compute_extension_opt = \ + cfg.MultiStrOpt('osapi_compute_extension', default=DEFAULT_EXTENSIONS) Option schemas are registered with with the config manager at runtime, but @@ -55,7 +55,7 @@ before the option is referenced: ... def _load_extensions(self): - for ext_factory in self.conf.osapi_extension: + for ext_factory in self.conf.osapi_compute_extension: .... A common usage pattern is for each option schema to be defined in the module or |