[openstack-neutron/el6-icehouse] Ensure routing key is specified in the address for a direct producer

[Ihar Hrachyshka]

commit c13fe876d032260bd13d26d9407b3e8cfd5338bd
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Wed Jun 11 13:05:03 2014 +0200

    Ensure routing key is specified in the address for a direct producer

 ...ing-key-is-specified-in-the-address-for-a.patch |   35 ++++++++++++++++++++
 openstack-neutron.spec                             |    7 +++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0009-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/0009-Ensure-routing-key-is-specified-in-the-address-for-a.patch
new file mode 100644
index 0000000..4dc2051
--- /dev/null
+++ b/0009-Ensure-routing-key-is-specified-in-the-address-for-a.patch
@@ -0,0 +1,35 @@
+From 067452a98622461cfa8416f55d90124d919b7b15 Mon Sep 17 00:00:00 2001
+From: Russell Bryant <rbryant at redhat.com>
+Date: Mon, 9 Jun 2014 16:53:21 -0400
+Subject: [PATCH] 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 9b8e7362f564f622e765a6a9a14b23d87a50dac8)
+(cherry picked from commit cac3aa8dbd57dded631f54353e54f42b3911e45d)
+---
+ neutron/openstack/common/rpc/impl_qpid.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/neutron/openstack/common/rpc/impl_qpid.py b/neutron/openstack/common/rpc/impl_qpid.py
+index 6f2a3dc..01e1d64 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
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 776f12d..6e394eb 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	20%{?dist}
+Release:	21%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -55,6 +55,7 @@ Patch0005: 0005-Removed-signing_dir-from-neutron.conf.patch
 Patch0006: 0006-Validate-CIDR-given-as-ip-prefix-in-security-group-r.patch
 Patch0007: 0007-netaddr-0.7.10-raises-ValueError-instead-of-AddrForm.patch
 Patch0008: 0008-Remove-kernel-version-check-for-OVS-VXLAN.patch
+Patch0009: 0009-Ensure-routing-key-is-specified-in-the-address-for-a.patch
 
 BuildArch:	noarch
 
@@ -478,6 +479,7 @@ IPSec.
 %patch0006 -p1
 %patch0007 -p1
 %patch0008 -p1
+%patch0009 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
@@ -1101,6 +1103,9 @@ fi
 
 
 %changelog
+* Wed Jun 11 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-21
+- Ensure routing key is specified in the address for a direct producer, bz#1108025
+
 * Thu May 29 2014 Miguel Ángel Ajo <majopela at redhat.com> 2014.1-20
 - Add nuage plugin packaging as openstack-neutron-nuage