1 From 81d2cd61980f39ef952bc715d4dec4d3a1d7efd1 Mon Sep 17 00:00:00 2001
2 From: Russell Bryant <rbryant@redhat.com>
3 Date: Mon, 9 Jun 2014 17:02:12 -0400
4 Subject: [PATCH] Ensure routing key is specified in the address for a direct
7 This change is already merged in oslo-incubator. Note that for
8 Ceilometer this is an Icehouse-specific patch since master has already
9 been updated to use the oslo.messaging library.
11 Original commit message body includes:
13 Porting this fix from oslo.messaging. This fixes the impl_qpid.py
14 driver to allow it to work with the latest stable upstream QPID broker
15 (version 0.28). See the Apache Qpid Jira bug
16 https://issues.apache.org/jira/browse/QPID-5557
18 Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7
21 ceilometer/openstack/common/rpc/impl_qpid.py | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
24 diff --git a/ceilometer/openstack/common/rpc/impl_qpid.py b/ceilometer/openstack/common/rpc/impl_qpid.py
25 index 7ba2240..e878b90 100644
26 --- a/ceilometer/openstack/common/rpc/impl_qpid.py
27 +++ b/ceilometer/openstack/common/rpc/impl_qpid.py
28 @@ -368,7 +368,7 @@ class DirectPublisher(Publisher):
29 """Init a 'direct' publisher."""
31 if conf.qpid_topology_version == 1:
33 + node_name = "%s/%s" % (msg_id, msg_id)
34 node_opts = {"type": "direct"}
35 elif conf.qpid_topology_version == 2:
36 node_name = "amq.direct/%s" % msg_id