diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-11-30 16:08:52 -0500 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-11-30 16:08:52 -0500 |
| commit | 4be71ff75b372adf42dba08a059106399b20a467 (patch) | |
| tree | 419c03af1d82c3345038e3e80b412c52fc98888f /nova | |
| parent | 0fc6c8f0d24a015b7ee8dd02cd433533ff6ebd65 (diff) | |
Fix rpc control_exchange regression.
A change was made in rpc that requires project's to define the
control_exchange option themselves. This was so the project's could
set their own default value. This change has made it in to nova without
adding the control_exchange option, meaning that it is using the default
of 'openstack', potentially conflicting with other projects.
See https://review.openstack.org/#/c/12518/
Fix bug 1083944.
Change-Id: Ifc00a537c4ee327cbee91fe1d911f8c402e350b7
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/config.py b/nova/config.py index f4118466f..9ce068e58 100644 --- a/nova/config.py +++ b/nova/config.py @@ -276,6 +276,9 @@ global_opts = [ cfg.StrOpt('auth_strategy', default='noauth', help='The strategy to use for auth: noauth or keystone.'), + cfg.StrOpt('control_exchange', + default='nova', + help='AMQP exchange to connect to if using RabbitMQ or Qpid'), ] cfg.CONF.register_opts(global_opts) |