openstack/heat
Code Issues Proposed changes

Merge "Change the engine-listener topic"

Browse Source
This commit is contained in:
Jenkins 2015-03-02 00:56:00 +00:00 committed by Gerrit Code Review
commit 1537128dd1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/service.py
View File

@ -228,7 +228,8 @@ class EngineListener(service.Service):
def start(self):
super(EngineListener, self).start()
self.target = messaging.Target(
server=self.host, topic=self.engine_id)
server=self.engine_id,
topic="heat-engine-listener")
server = rpc_messaging.get_rpc_server(self.target, self)
server.start()

4
heat/engine/stack_lock.py
View File

@ -39,7 +39,9 @@ class StackLock(object):
@staticmethod
def engine_alive(context, engine_id):
client = rpc_messaging.get_rpc_client(version='1.0', topic=engine_id)
client = rpc_messaging.get_rpc_client(
version='1.0', topic="heat-engine-listener",
server=engine_id)
client_context = client.prepare(
timeout=cfg.CONF.engine_life_check_timeout)
try: