Deleted backported patch 0007 from spec for RPM.

Change-Id: I422110204fb0983fa532aa20da4c9129890d616c

diff --git a/rpm/SOURCES/0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/rpm/SOURCES/0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
deleted file mode 100644 (file)
index c852a86..0000000
--- a/rpm/SOURCES/0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9155f7bf00bb50e4988b047e311a2e089e8b8ac9 Mon Sep 17 00:00:00 2001
-From: Russell Bryant <rbryant@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 a7dcf29..5fb2c49 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/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index 07671b1b9e39dc76570a471cf6abd095e73dc5dd..02fc9621ba881999730af13c200c9375952b54f2 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -53,7 +53,6 @@ Patch0003: 0003-remove-runtime-dependency-on-pbr.patch
 Patch0004: 0004-Sync-service-and-systemd-modules-from-oslo-incubator.patch
 Patch0005: 0005-Removed-signing_dir-from-neutron.conf.patch
 Patch0006: 0006-Remove-kernel-version-check-for-OVS-VXLAN.patch
-Patch0007: 0007-Ensure-routing-key-is-specified-in-the-address-for-a.patch
 
 BuildArch:     noarch
 
@@ -475,7 +474,6 @@ IPSec.
 %patch0004 -p1
 %patch0005 -p1
 %patch0006 -p1
-%patch0007 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
@@ -1191,7 +1189,7 @@ fi
 
 * Wed Mar 19 2014 Miguel Ángel Ajo <majopela@redhat.com> - 2014.1.b3-8
 - Create agents table when ML2 core_plugin is used
- 
+
 * Tue Mar 11 2014 Miguel Ángel Ajo <majopela@redhat.com> - 2014.1.b3-7
 - Fixed a broken dependency/typo lxaml -> lxml
 - Enforcing python-six >= 1.4.1 at least