openstack
/
heat
Code Issues Proposed changes

Set the rpc control_exchange "again" 

rpc_set_default() is never called, since all the config
opts always registed just do this globally.

Change-Id: I277318ec5e903074976ee39460d8583505a723a4
Closes-bug: #1257595
This commit is contained in:
Angus Salkeld 2013-12-04 17:03:31 +11:00
parent e2e711fc1c
commit 7636d8f1e1
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/heat/heat.conf.sample
View File

@ -308,7 +308,7 @@
# AMQP exchange to connect to if using RabbitMQ or Qpid
# (string value)
#control_exchange=openstack
#control_exchange=heat
#

5
heat/common/config.py
View File

@ -162,6 +162,7 @@ revision_opts = [
cfg.CONF.register_opts(engine_opts)
cfg.CONF.register_opts(service_opts)
cfg.CONF.register_opts(rpc_opts)
rpc.set_defaults(control_exchange='heat')
cfg.CONF.register_group(paste_deploy_group)
cfg.CONF.register_opts(paste_deploy_opts, group=paste_deploy_group)
cfg.CONF.register_group(auth_password_group)
@ -182,10 +183,6 @@ cfg.CONF.set_default(name='allowed_rpc_exception_modules',
default=allowed_rpc_exception_modules)
def rpc_set_default():
rpc.set_defaults(control_exchange='heat')
def _get_deployment_flavor():
"""
Retrieve the paste_deploy.flavor config item, formatted appropriately