openstack/cinder
Code Issues Proposed changes

Merge "Remove incorrect class in cinder.conf.sample"

Browse Source
This commit is contained in:
Jenkins 2013-10-03 04:34:04 +00:00 committed by Gerrit Code Review
commit 9631872c03
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/openstack/common/rpc/__init__.py
View File

@ -56,8 +56,7 @@ rpc_opts = [
help='Seconds to wait before a cast expires (TTL). ' help='Seconds to wait before a cast expires (TTL). '
'Only supported by impl_zmq.'), 'Only supported by impl_zmq.'),
cfg.ListOpt('allowed_rpc_exception_modules', cfg.ListOpt('allowed_rpc_exception_modules',
default=['cinder.openstack.common.exception', default=['nova.exception',
'nova.exception',
'cinder.exception', 'cinder.exception',
'exceptions', 'exceptions',
], ],

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

@ -746,7 +746,7 @@
# Modules of exceptions that are permitted to be recreatedupon # Modules of exceptions that are permitted to be recreatedupon
# receiving exception data from an rpc call. (list value) # receiving exception data from an rpc call. (list value)
#allowed_rpc_exception_modules=cinder.openstack.common.exception,nova.exception,cinder.exception,exceptions #allowed_rpc_exception_modules=nova.exception,cinder.exception,exceptions
# If passed, use a fake RabbitMQ provider (boolean value) # If passed, use a fake RabbitMQ provider (boolean value)
#fake_rabbit=false #fake_rabbit=false