[openstack-heat/f20] Updated patches from f20-patches

[Jeff Peeler]

commit b7cffc38f0f54fc38e82ea2423fb937bac6f72cb
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Wed Aug 6 11:56:19 2014 -0400

    Updated patches from f20-patches
    
    Added qpid routing key patch
    
    Resolves: rhbz#1127018

 ...ing-key-is-specified-in-the-address-for-a.patch |   33 ++++++++++++++++++++
 openstack-heat.spec                                |    3 ++
 2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/0003-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/0003-Ensure-routing-key-is-specified-in-the-address-for-a.patch
new file mode 100644
index 0000000..b508eb9
--- /dev/null
+++ b/0003-Ensure-routing-key-is-specified-in-the-address-for-a.patch
@@ -0,0 +1,33 @@
+From d455940466a243fe45c49be1e29573af2e66751b Mon Sep 17 00:00:00 2001
+From: Russell Bryant <rbryant at redhat.com>
+Date: Mon, 9 Jun 2014 16:58:16 -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
+
+Related-Bug: LP #1300318
+Resolves: rhbz#1106858
+---
+ heat/openstack/common/rpc/impl_qpid.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heat/openstack/common/rpc/impl_qpid.py b/heat/openstack/common/rpc/impl_qpid.py
+index cc44b48..0445487 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
diff --git a/openstack-heat.spec b/openstack-heat.spec
index 2b6af72..fa7ed0f 100644
--- a/openstack-heat.spec
+++ b/openstack-heat.spec
@@ -28,6 +28,7 @@ Source20:   heat-dist.conf
 #
 Patch0001: 0001-Switch-to-using-M2Crypto.patch
 Patch0002: 0002-remove-pbr-runtime-dependency.patch
+Patch0003: 0003-Ensure-routing-key-is-specified-in-the-address-for-a.patch
 
 BuildArch: noarch
 BuildRequires: git
@@ -78,6 +79,8 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
+
 sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
 sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py