Deleted backported patch 0001 from spec for RPM

Change-Id: I5379267c7f0b4712c0af49d04401d194402545fb

diff --git a/rpm/SOURCES/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/rpm/SOURCES/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
deleted file mode 100644 (file)
index 59dc268..0000000
--- a/rpm/SOURCES/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 81d2cd61980f39ef952bc715d4dec4d3a1d7efd1 Mon Sep 17 00:00:00 2001
-From: Russell Bryant <rbryant@redhat.com>
-Date: Mon, 9 Jun 2014 17:02:12 -0400
-Subject: [PATCH] Ensure routing key is specified in the address for a direct
- producer
-
-This change is already merged in oslo-incubator.  Note that for
-Ceilometer this is an Icehouse-specific patch since master has already
-been updated to use the oslo.messaging library.
-
-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
----
- ceilometer/openstack/common/rpc/impl_qpid.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ceilometer/openstack/common/rpc/impl_qpid.py b/ceilometer/openstack/common/rpc/impl_qpid.py
-index 7ba2240..e878b90 100644
---- a/ceilometer/openstack/common/rpc/impl_qpid.py
-+++ b/ceilometer/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-ceilometer.spec b/rpm/SPECS/openstack-ceilometer.spec
index bc08969cc9f13d91b1868dc3cb63e1eea0fc2979..b433e1dc53f6a6162a28639ca9fb9dbafec76432 100644 (file)
--- a/rpm/SPECS/openstack-ceilometer.spec
+++ b/rpm/SPECS/openstack-ceilometer.spec
@@ -29,11 +29,6 @@ Source150:        %{name}-alarm-evaluator.upstart
 Source16:         %{name}-notification.init
 Source160:        %{name}-notification.upstart
 
-#
-# patches_base=2014.1.1
-#
-Patch0001: 0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
-
 # This is EL6 specific and not upstream
 Patch100:         openstack-ceilometer-newdeps.patch
 
@@ -262,8 +257,6 @@ This package contains documentation files for ceilometer.
 %prep
 %setup -q -n ceilometer-%{version}
 
-%patch0001 -p1
-
 # Apply EL6 patch
 %patch100 -p1