rpm/SOURCES/0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch

   1 From 9155f7bf00bb50e4988b047e311a2e089e8b8ac9 Mon Sep 17 00:00:00 2001
   2 From: Russell Bryant <rbryant@redhat.com>
   3 Date: Mon, 9 Jun 2014 16:53:21 -0400
   4 Subject: [PATCH] Ensure routing key is specified in the address for a direct
   5  producer
   6
   7 This change is already merged in oslo-incubator.  Original commit
   8 message body includes:
   9
  10     Porting this fix from oslo.messaging.  This fixes the impl_qpid.py
  11     driver to allow it to work with the latest stable upstream QPID broker
  12     (version 0.28).  See the Apache Qpid Jira bug
  13     https://issues.apache.org/jira/browse/QPID-5557
  14
  15 Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7
  16 Related-Bug: #1300318
  17 (cherry picked from commit 9b8e7362f564f622e765a6a9a14b23d87a50dac8)
  18 (cherry picked from commit cac3aa8dbd57dded631f54353e54f42b3911e45d)
  19 ---
  20  neutron/openstack/common/rpc/impl_qpid.py | 2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 diff --git a/neutron/openstack/common/rpc/impl_qpid.py b/neutron/openstack/common/rpc/impl_qpid.py
  24 index a7dcf29..5fb2c49 100644
  25 --- a/neutron/openstack/common/rpc/impl_qpid.py
  26 +++ b/neutron/openstack/common/rpc/impl_qpid.py
  27 @@ -368,7 +368,7 @@ class DirectPublisher(Publisher):
  28          """Init a 'direct' publisher."""
  29
  30          if conf.qpid_topology_version == 1:
  31 -            node_name = msg_id
  32 +            node_name = "%s/%s" % (msg_id, msg_id)
  33              node_opts = {"type": "direct"}
  34          elif conf.qpid_topology_version == 2:
  35              node_name = "amq.direct/%s" % msg_id