From: Gary Kotton <gkotton@redhat.com>
Date: Wed, 16 Jan 2013 16:28:44 +0000 (+0000)
Subject: Ensure that agents also set control_exchange
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dfebeb7fe8b5e70b2ec2f38950d8a1cb0f97363d;p=openstack-build%2Fneutron-build.git

Ensure that agents also set control_exchange

Fixes bug 1100357

Change-Id: I6302edecf851588762d39c99d2f7b2e18ba04bc7
---

diff --git a/quantum/common/config.py b/quantum/common/config.py
index 029315108..2394ed438 100644
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -63,9 +63,11 @@ core_cli_opts = [
 cfg.CONF.register_opts(core_opts)
 cfg.CONF.register_cli_opts(core_cli_opts)
 
+# Ensure that the control exchange is set correctly
+rpc.set_defaults(control_exchange='quantum')
+
 
 def parse(args):
-    rpc.set_defaults(control_exchange='quantum')
     cfg.CONF(args=args, project='quantum',
              version='%%prog %s' % quantum_version.version_string_with_vcs())