summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Giusti <kgiusti@gmail.com>2015-10-01 16:43:56 -0400
committerKenneth Giusti <kgiusti@gmail.com>2015-10-08 14:06:33 -0400
commit1b605c1466678bd01c9d2fe672098af001c30321 (patch)
treead6211cad2f10e38cf4f7a6062eceb3fc8d860fd
parent7eadea5bec0ea78ba5080cf52270a7218f29ef21 (diff)
downloadoslo-messaging-1b605c1466678bd01c9d2fe672098af001c30321.tar.gz
Use the hostname from the Transport for GSSAPI Authentication
Previously, the AMQP 1.0 driver did not pass the proper hostname to pyngus. This prevented GSSAPI authentication from working properly. Change-Id: Ibc6678e7cbae6dd5108d1650dbb8ddf837aa3648 Closes-Bug: #1503258
-rw-r--r--oslo_messaging/_drivers/protocols/amqp/controller.py2
-rw-r--r--tox.ini1
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:
diff --git a/tox.ini b/tox.ini
index c576bed..7e70682 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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}'