From f8ffddca0a7014a33f3b1aec1c33fe43ff39ef12 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 22 Jan 2013 16:33:14 +0000 Subject: [PATCH] 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 --- heat/common/heat_keystoneclient.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py index 48444a53..b1bbc6f7 100644 --- 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 " + -- 2.45.2