From: Russell Bryant Date: Mon, 9 Jun 2014 20:53:21 +0000 (-0400) Subject: Ensure routing key is specified in the address for a direct producer X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9b8e7362f564f622e765a6a9a14b23d87a50dac8;p=openstack-build%2Fneutron-build.git 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 --- diff --git a/neutron/openstack/common/rpc/impl_qpid.py b/neutron/openstack/common/rpc/impl_qpid.py index a7dcf29d3..5fb2c49ee 100644 --- a/neutron/openstack/common/rpc/impl_qpid.py +++ b/neutron/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