openstack/deb-cinder
Code Issues Proposed changes

Update rpc from openstack-common.

Browse Source 
Fix bug 1049843.

This commit syncs the following commit from openstack-common:

    commit 7e9f72bb28456c912aa80945dbdb8d200f81b462
    Make projects define 'control_exchange'.

This change allows cinder to set a project-specific default of 'cinder'
for the 'control_exchange' option.  The option is now defined in
cinder.flags.

Change-Id: Ia91c172ca0665798d616f9faf5880770074235c8
This commit is contained in:
Russell Bryant
2012-09-12 12:30:04 -04:00
parent 24b3cd5696
commit b6cf220db9
6 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,6 +171,9 @@
#### (StrOpt) The strategy to use for auth. Supports noauth, keystone, and
#### deprecated.
# control_exchange=cinder
#### (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid
######## defined in cinder.policy ########
@@ -339,13 +342,10 @@
#### (IntOpt) Seconds to wait before a cast expires (TTL). Only supported
#### by impl_zmq.
# allowed_rpc_exception_modules=cinder.openstack.common.exception,nova.exception
# allowed_rpc_exception_modules=cinder.openstack.common.exception,nova.exception,cinder.exception
#### (ListOpt) Modules of exceptions that are permitted to be recreatedupon
#### receiving exception data from an rpc call.
# control_exchange=nova
#### (StrOpt) AMQP exchange to connect to if using RabbitMQ or Qpid
# fake_rabbit=false
#### (BoolOpt) If passed, use a fake RabbitMQ provider