summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-24 22:10:14 +0000
committerGerrit Code Review <review@openstack.org>2014-07-24 22:10:14 +0000
commit8d008af4d611376659ddad9cdce56bd2f1396c41 (patch)
tree6b628b9f161cc1d2b773477cf325cf199555b751
parent871ebd548d623671271edf398bebea3167bbb1c8 (diff)
parentff482c9939d3907cd2ecf91cd24ba8c6b4226230 (diff)
downloadkeystone-8d008af4d611376659ddad9cdce56bd2f1396c41.tar.gz
Merge "Ensure routing key is specified in the address for a direct producer" into stable/havana
-rw-r--r--keystone/openstack/common/rpc/impl_qpid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/openstack/common/rpc/impl_qpid.py b/keystone/openstack/common/rpc/impl_qpid.py
index cad438886..8d0a55c2f 100644
--- a/keystone/openstack/common/rpc/impl_qpid.py
+++ b/keystone/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