From: Mark McClain <mark.mcclain@dreamhost.com>
Date: Fri, 5 Oct 2012 19:51:19 +0000 (-0400)
Subject: Add control_exchange option to common/config.py
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=86c36e073dd31cfee4b9c8e6cddacf8b1c7d19dc;p=openstack-build%2Fneutron-build.git

Add control_exchange option to common/config.py

fixes bug 1062517

Follows the instructions in the openstack/common/rpc/__init__.py and
defines a control_exchange option.

Change-Id: I92c50e1aea44954b2c9d62db1df536b9044b6951
---

diff --git a/quantum/common/config.py b/quantum/common/config.py
index 1ca191aa9..3032c3322 100644
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -50,7 +50,11 @@ core_opts = [
     cfg.IntOpt('max_subnet_host_routes', default=20),
     cfg.StrOpt('state_path', default='.'),
     cfg.IntOpt('dhcp_lease_duration', default=120),
-    cfg.BoolOpt('allow_overlapping_ips', default=False)
+    cfg.BoolOpt('allow_overlapping_ips', default=False),
+    cfg.StrOpt('control_exchange',
+               default='quantum',
+               help='AMQP exchange to connect to if using RabbitMQ or Qpid')
+
 ]
 
 # Register the configuration options