Merge "Ensure that agents also set control_exchange"

This commit is contained in:
Jenkins 2013-01-17 01:20:52 +00:00 committed by Gerrit Code Review
commit eef903f64b

View File

@ -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())