From cdf87e7fcaf2fe444904e785e1588bdb057f97de Mon Sep 17 00:00:00 2001 From: Endre Karlson Date: Fri, 14 Nov 2014 01:11:50 +0100 Subject: [PATCH] Make token + endpoints work correctly Change-Id: I3aa15cf2c3304c057fa22204475ac287de02e8eb --- designateclient/v1/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/designateclient/v1/__init__.py b/designateclient/v1/__init__.py index a26abacf..aab6772f 100644 --- a/designateclient/v1/__init__.py +++ b/designateclient/v1/__init__.py @@ -15,6 +15,7 @@ # under the License. from keystoneclient import adapter from keystoneclient.auth.identity import generic +from keystoneclient.auth import token_endpoint from keystoneclient import session as ks_session from stevedore import extension @@ -62,8 +63,11 @@ def __init__(self, endpoint=None, username=None, user_id=None, } if token: - auth_args['token'] = token - session.auth = generic.Token(**auth_args) + # To mimic typical v1 behaviour I copied this + endpoint = endpoint.rstrip('/') + if not endpoint.endswith('v1'): + endpoint = "%s/v1" % endpoint + session.auth = token_endpoint.Token(endpoint, token) else: password_args = { 'username': username,