Merge "Added ability to load specific extensions."

This commit is contained in:
Jenkins
2012-02-08 21:49:21 +00:00
committed by Gerrit Code Review

View File

@@ -313,11 +313,21 @@ global_opts = [
cfg.StrOpt('ec2_path', cfg.StrOpt('ec2_path',
default='/services/Cloud', default='/services/Cloud',
help='suffix for ec2'), help='suffix for ec2'),
cfg.ListOpt('osapi_compute_ext_list',
default=[],
help='Specify list of extensions to load when using osapi_'
'compute_extension option with nova.api.openstack.'
'compute.contrib.select_extensions'),
cfg.MultiStrOpt('osapi_compute_extension', cfg.MultiStrOpt('osapi_compute_extension',
default=[ default=[
'nova.api.openstack.compute.contrib.standard_extensions' 'nova.api.openstack.compute.contrib.standard_extensions'
], ],
help='osapi compute extension to load'), help='osapi compute extension to load'),
cfg.ListOpt('osapi_volume_ext_list',
default=[],
help='Specify list of extensions to load when using osapi_'
'volume_extension option with nova.api.openstack.'
'volume.contrib.select_extensions'),
cfg.MultiStrOpt('osapi_volume_extension', cfg.MultiStrOpt('osapi_volume_extension',
default=[ default=[
'nova.api.openstack.volume.contrib.standard_extensions' 'nova.api.openstack.volume.contrib.standard_extensions'