From 1b605c1466678bd01c9d2fe672098af001c30321 Mon Sep 17 00:00:00 2001
From: Kenneth Giusti <kgiusti@gmail.com>
Date: Thu, 1 Oct 2015 16:43:56 -0400
Subject: [PATCH] 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
---
 oslo_messaging/_drivers/protocols/amqp/controller.py | 2 +-
 tox.ini                                              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/oslo_messaging/_drivers/protocols/amqp/controller.py b/oslo_messaging/_drivers/protocols/amqp/controller.py
index c6fa2b70c..4b9a7621d 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 c576bed72..7e70682e7 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}'