openstack/cinder
Code Issues Proposed changes

Merge "Update osapi_volume_extension default."

Browse Source
This commit is contained in:
Jenkins 2013-01-31 07:13:18 +00:00 committed by Gerrit Code Review
commit cfd4c3941e
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/api/extensions.py
View File

@ -269,9 +269,8 @@ class ExtensionManager(object):
extensions = list(self.cls_list) extensions = list(self.cls_list)
# NOTE(thingee): Until we update devstack to have the new location, # NOTE(thingee): Backwards compat for the old extension loader path.
# we'll just set replace the old contrib path with the new and preserve # We can drop this post-grizzly in the H release.
# any other extensions that need to be loaded
old_contrib_path = ('cinder.api.openstack.volume.contrib.' old_contrib_path = ('cinder.api.openstack.volume.contrib.'
'standard_extensions') 'standard_extensions')
new_contrib_path = 'cinder.api.contrib.standard_extensions' new_contrib_path = 'cinder.api.contrib.standard_extensions'

7
cinder/flags.py
View File

@ -145,13 +145,8 @@ global_opts = [
help='Specify list of extensions to load when using osapi_' help='Specify list of extensions to load when using osapi_'
'volume_extension option with cinder.api.contrib.' 'volume_extension option with cinder.api.contrib.'
'select_extensions'), 'select_extensions'),
# NOTE(thingee): default contrib for old and new location for compatibility
cfg.MultiStrOpt('osapi_volume_extension', cfg.MultiStrOpt('osapi_volume_extension',
default=[ default=['cinder.api.contrib.standard_extensions'],
'cinder.api.openstack.volume.contrib.'
'standard_extensions',
'cinder.api.contrib.standard_extensions',
],
help='osapi volume extension to load'), help='osapi volume extension to load'),
cfg.StrOpt('osapi_volume_base_URL', cfg.StrOpt('osapi_volume_base_URL',
default=None, default=None,

30
etc/cinder/cinder.conf.sample
View File

@ -126,7 +126,6 @@
#osapi_volume_ext_list= #osapi_volume_ext_list=
# osapi volume extension to load (multi valued) # osapi volume extension to load (multi valued)
#osapi_volume_extension=cinder.api.openstack.volume.contrib.standard_extensions
#osapi_volume_extension=cinder.api.contrib.standard_extensions #osapi_volume_extension=cinder.api.contrib.standard_extensions
# Base URL that will be presented to users in links to the # Base URL that will be presented to users in links to the
@ -598,6 +597,33 @@
#qpid_tcp_nodelay=true #qpid_tcp_nodelay=true
#
# Options defined in cinder.openstack.common.rpc.impl_zmq
#
# ZeroMQ bind address. Should be a wildcard (*), an ethernet
# interface, or IP. The "host" option should point or resolve
# to this address. (string value)
#rpc_zmq_bind_address=*
# MatchMaker driver (string value)
#rpc_zmq_matchmaker=cinder.openstack.common.rpc.matchmaker.MatchMakerLocalhost
# ZeroMQ receiver listening port (integer value)
#rpc_zmq_port=9501
# Number of ZeroMQ contexts, defaults to 1 (integer value)
#rpc_zmq_contexts=1
# Directory for holding IPC sockets (string value)
#rpc_zmq_ipc_dir=/var/run/openstack
# Name of this node. Must be a valid hostname, FQDN, or IP
# address. Must match "host" option, if running Nova. (string
# value)
#rpc_zmq_host=cinder
# #
# Options defined in cinder.openstack.common.rpc.matchmaker # Options defined in cinder.openstack.common.rpc.matchmaker
# #
@ -1078,4 +1104,4 @@
#volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver #volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
# Total option count: 238 # Total option count: 244