summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-12-05 22:36:14 +0000
committerGerrit Code Review <review@openstack.org>2012-12-05 22:36:14 +0000
commit255a27333092be0523949bd624c94b740515d018 (patch)
tree1df45535437ca09f72b435dce502cc66093c27e8 /openstack/common
parentea7ced276d2f080718cd89f3a77378cdf24fabf5 (diff)
parent3f8df660030a078db2c295e7ae74a32c88c7af02 (diff)
downloadoslo-255a27333092be0523949bd624c94b740515d018.tar.gz
oslo-255a27333092be0523949bd624c94b740515d018.tar.xz
oslo-255a27333092be0523949bd624c94b740515d018.zip
Merge "Fix qpid cast_to_server regression."
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/rpc/impl_qpid.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py
index fc8a382..7f21461 100644
--- a/openstack/common/rpc/impl_qpid.py
+++ b/openstack/common/rpc/impl_qpid.py
@@ -279,6 +279,13 @@ class Connection(object):
self.consumer_thread = None
self.conf = conf
+ if server_params and 'hostname' in server_params:
+ # NOTE(russellb) This enables support for cast_to_server.
+ server_params['qpid_hosts'] = [
+ '%s:%d' % (server_params['hostname'],
+ server_params.get('port', 5672))
+ ]
+
params = {
'qpid_hosts': self.conf.qpid_hosts,
'username': self.conf.qpid_username,