heat_keystoneclient make token auth work

username/password are ignored so don't pass them, and
tenant needs to be the context tenant not the service
tenant or token auth will fail.

Fixes bug 1072944

Change-Id: I862d0041daad278dfe7bc16d59dc733dde90e758
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py
index 48444a53a12ada66814dd28f7eff8ef136e93f14..b1bbc6f7bec646ca867eb0307a0c7b7761d06414 100644 (file)
--- a/heat/common/heat_keystoneclient.py
+++ b/heat/common/heat_keystoneclient.py
@@ -42,9 +42,7 @@ class KeystoneClient(object):
             kwargs['tenant_name'] = context.tenant
             kwargs['tenant_id'] = context.tenant_id
         elif context.auth_token is not None:
-            kwargs['username'] = context.service_user
-            kwargs['password'] = context.service_password
-            kwargs['tenant_name'] = context.service_tenant
+            kwargs['tenant_name'] = context.tenant
             kwargs['token'] = context.auth_token
         else:
             logger.error("Keystone connection failed, no password or " +