diff options
| author | Nikita Konovalov <nkonovalov@mirantis.com> | 2013-10-02 19:13:10 +0400 |
|---|---|---|
| committer | Nikita Konovalov <nkonovalov@mirantis.com> | 2013-10-03 10:25:43 +0400 |
| commit | c5f519ef0e4f6a41b34f61a43104f2cae6dbfae7 (patch) | |
| tree | 2e67ba411b22f614449b95df4556d1bcebaeed0d | |
| parent | f1025cde55c78560b28ee4000190c5302f7cd45b (diff) | |
| download | python-saharaclient-0.3.rc1.tar.gz | |
Support for keystone v30.3.rc1
Fixes: bug #1234215
Change-Id: I099495742602e9f56dd33a2690b29960d04552c9
| -rw-r--r-- | savannaclient/api/client.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/savannaclient/api/client.py b/savannaclient/api/client.py index c96ad1e..1c97485 100644 --- a/savannaclient/api/client.py +++ b/savannaclient/api/client.py @@ -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, |