diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-09 14:08:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-09 14:08:22 +0000 |
| commit | aee3b94d23e309e22452823f8909980c6dd84f52 (patch) | |
| tree | 5a4745990148eb66955f5ed1e8ee93be0835a69e | |
| parent | 367e28b0f1e48e2b35a43d2a1cd825da3c6c81a6 (diff) | |
| parent | 1b605c1466678bd01c9d2fe672098af001c30321 (diff) | |
| download | oslo-messaging-aee3b94d23e309e22452823f8909980c6dd84f52.tar.gz | |
Merge "Use the hostname from the Transport for GSSAPI Authentication"
| -rw-r--r-- | oslo_messaging/_drivers/protocols/amqp/controller.py | 2 | ||||
| -rw-r--r-- | tox.ini | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/oslo_messaging/_drivers/protocols/amqp/controller.py b/oslo_messaging/_drivers/protocols/amqp/controller.py index c6fa2b7..4b9a762 100644 --- a/oslo_messaging/_drivers/protocols/amqp/controller.py +++ b/oslo_messaging/_drivers/protocols/amqp/controller.py @@ -460,7 +460,7 @@ class Controller(pyngus.ConnectionEventHandler): def _do_connect(self): """Establish connection and reply subscription on processor thread.""" host = self.hosts.current - conn_props = {} + conn_props = {'hostname': host.hostname} if self.idle_timeout: conn_props["idle-time-out"] = float(self.idle_timeout) if self.trace_protocol: @@ -5,6 +5,7 @@ envlist = py34,py27,pep8 setenv = VIRTUAL_ENV={envdir} OS_TEST_TIMEOUT=30 + PN_TRACE_FRM=1 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' |