diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-12 13:47:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-12 13:47:52 +0000 |
| commit | ccaaa26dd3afa62599ea3b476e2a5d1af7e075ef (patch) | |
| tree | 9943bd86980840fff435edb1a2f5c5536248545b /openstack/common/rpc/__init__.py | |
| parent | 95cd3a7fad2d0335c65394379c35a798df9d25b4 (diff) | |
| parent | 16ad97c13fb296125a843d1dda31900994628727 (diff) | |
| download | oslo-ccaaa26dd3afa62599ea3b476e2a5d1af7e075ef.tar.gz oslo-ccaaa26dd3afa62599ea3b476e2a5d1af7e075ef.tar.xz oslo-ccaaa26dd3afa62599ea3b476e2a5d1af7e075ef.zip | |
Merge "Make projects define 'control_exchange'."
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) |