summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2014-06-09 16:58:16 -0400
committerIhar Hrachyshka <ihrachys@redhat.com>2014-06-11 11:53:34 +0000
commit82f825dbea3f613f3707111cadeac5b915010636 (patch)
tree81f19dc81556ecd9fc83d6d7b5f4481f5db65923
parent7e114a38712da8947ee7ad93eabda34f5e4aa65a (diff)
downloadheat-82f825dbea3f613f3707111cadeac5b915010636.tar.gz
Ensure routing key is specified in the address for a direct producer
This change is already merged in oslo-incubator. Original commit message body includes: Porting this fix from oslo.messaging. This fixes the impl_qpid.py driver to allow it to work with the latest stable upstream QPID broker (version 0.28). See the Apache Qpid Jira bug https://issues.apache.org/jira/browse/QPID-5557 Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7 Related-Bug: #1300318 (cherry picked from commit 3597ffca77133101943114b80fd4263bada87f4f)
-rw-r--r--heat/openstack/common/rpc/impl_qpid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/heat/openstack/common/rpc/impl_qpid.py b/heat/openstack/common/rpc/impl_qpid.py
index cc44b48f2..044548760 100644
--- a/heat/openstack/common/rpc/impl_qpid.py
+++ b/heat/openstack/common/rpc/impl_qpid.py
@@ -369,7 +369,7 @@ class DirectPublisher(Publisher):
"""Init a 'direct' publisher."""
if conf.qpid_topology_version == 1:
- node_name = msg_id
+ node_name = "%s/%s" % (msg_id, msg_id)
node_opts = {"type": "direct"}
elif conf.qpid_topology_version == 2:
node_name = "amq.direct/%s" % msg_id