summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2014-06-09 16:58:16 -0400
committerRussell Bryant <rbryant@redhat.com>2014-06-09 16:59:02 -0400
commit6facf30d46064630c1ae9f93d9180d9fa94fe0a9 (patch)
tree31ab65271c04dbcb120263e854dab6584a26aa3d
parentaed6a0401e172e28b99a287a88942616ae43009c (diff)
downloadheat-6facf30d46064630c1ae9f93d9180d9fa94fe0a9.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 90ddb30c8..82b76783a 100644
--- a/heat/openstack/common/rpc/impl_qpid.py
+++ b/heat/openstack/common/rpc/impl_qpid.py
@@ -368,7 +368,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