openstack/python-saharaclient
Code Issues Proposed changes

Support for keystone v3

Browse Source 
Fixes: bug #1234215

Change-Id: I099495742602e9f56dd33a2690b29960d04552c9
This commit is contained in:
Nikita Konovalov 2013-10-02 19:13:10 +04:00
parent f1025cde55
commit c5f519ef0e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
savannaclient/api/client.py
View File

@ -17,7 +17,8 @@
import six
from keystoneclient.v2_0 import client as keystone_client
from keystoneclient.v2_0 import client as keystone_client_v2
from keystoneclient.v3 import client as keystone_client_v3
from savannaclient.api import cluster_templates
from savannaclient.api import clusters
@ -44,6 +45,9 @@ class Client(object):
if project_name and project_id:
raise RuntimeError('Only project name or '
'project id should be set')
keystone_client = keystone_client_v2 \
if "v2.0" in auth_url \
else keystone_client_v3
keystone = keystone_client.Client(username=username,
password=api_key,
token=input_auth_token,