diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-09-06 14:37:52 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-09-11 10:38:39 -0400 |
| commit | 16ad97c13fb296125a843d1dda31900994628727 (patch) | |
| tree | 308482bd12c824e7d8884a59d26ce04df916fa51 /openstack/common/rpc/__init__.py | |
| parent | 1071b9da480d25e7cee556d7f9b483f8ac258ffb (diff) | |
| download | oslo-16ad97c13fb296125a843d1dda31900994628727.tar.gz oslo-16ad97c13fb296125a843d1dda31900994628727.tar.xz oslo-16ad97c13fb296125a843d1dda31900994628727.zip | |
Make projects define 'control_exchange'.
The 'control_exchange' option needs to have a project-specific default
value. Just don't register this option and expect it to be registered
by the project using this code, at least for now.
****** IMPORTANT NOTE WHEN IMPORTING THIS CHANGE ******
If you are importing this change into a project that uses rpc, you must
add the control_exchange option in your code!
*******************************************************
Change-Id: Ida5a8637c419e709bbf22fcad57b0f11c31bb959
Diffstat (limited to 'openstack/common/rpc/__init__.py')
| -rw-r--r-- | openstack/common/rpc/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/openstack/common/rpc/__init__.py b/openstack/common/rpc/__init__.py index 5b1f8d1..da45d5a 100644 --- a/openstack/common/rpc/__init__.py +++ b/openstack/common/rpc/__init__.py @@ -53,12 +53,17 @@ rpc_opts = [ ], help='Modules of exceptions that are permitted to be recreated' 'upon receiving exception data from an rpc call.'), - cfg.StrOpt('control_exchange', - default='nova', - help='AMQP exchange to connect to if using RabbitMQ or Qpid'), cfg.BoolOpt('fake_rabbit', default=False, help='If passed, use a fake RabbitMQ provider'), + # + # The following options are not registered here, but are expected to be + # present. The project using this library must register these options with + # the configuration so that project-specific defaults may be defined. + # + #cfg.StrOpt('control_exchange', + # default='nova', + # help='AMQP exchange to connect to if using RabbitMQ or Qpid'), ] cfg.CONF.register_opts(rpc_opts) |