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 02931510823499f3babca5cc7816e27f59634b7e..2394ed4381edc46ddc78239c8942d85daaa9daf2 100644 (file)
--- 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())