diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-12 09:28:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-12 09:28:44 +0000 |
| commit | 188c4ce77ef535564ff3c6a5fcfc8aea274ea626 (patch) | |
| tree | 12fa398422fb96c50e736bf02e8f10a4a59db02e /heat | |
| parent | a42bb853b893eafda206a9e7da1a38756c7efc75 (diff) | |
| parent | a052b06f9e88a1179ba72acc53c4212083025fdd (diff) | |
| download | heat-188c4ce77ef535564ff3c6a5fcfc8aea274ea626.tar.gz | |
Merge "Change the engine-listener topic" into stable/juno
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/engine/service.py | 3 | ||||
| -rw-r--r-- | heat/engine/stack_lock.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py index e70579db0..a375de513 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -292,7 +292,8 @@ class EngineListener(service.Service): def start(self): super(EngineListener, self).start() self.target = messaging.Target( - server=cfg.CONF.host, topic=self.engine_id) + server=self.engine_id, + topic="heat-engine-listener") server = rpc_messaging.get_rpc_server(self.target, self) server.start() diff --git a/heat/engine/stack_lock.py b/heat/engine/stack_lock.py index 7d43be6ec..0711082c0 100644 --- a/heat/engine/stack_lock.py +++ b/heat/engine/stack_lock.py @@ -38,7 +38,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: |