diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-01 14:30:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-01 14:30:45 +0000 |
| commit | ac7737dc8b5122ff83beff2ae00eef7365fa032d (patch) | |
| tree | f53f21d7a163cf5466874b4fc91429bf85fd3e1b /nova | |
| parent | 29cac1f08cec5eb1ed00cb0b62ec9b75a78038be (diff) | |
| parent | 4be71ff75b372adf42dba08a059106399b20a467 (diff) | |
| download | nova-ac7737dc8b5122ff83beff2ae00eef7365fa032d.tar.gz nova-ac7737dc8b5122ff83beff2ae00eef7365fa032d.tar.xz nova-ac7737dc8b5122ff83beff2ae00eef7365fa032d.zip | |
Merge "Fix rpc control_exchange regression."
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) |