summaryrefslogtreecommitdiff
path: root/openstackclient/volume/client.py
diff options
context:
space:
mode:
authorYejia Xu <yejia@unitedstack.com>2014-05-05 00:11:17 +0000
committerSteve Martinelli <stevemar@ca.ibm.com>2014-05-05 17:09:28 +0000
commit2cc3a2fdbddb10cc26ffb49e4a7cfa114a1e9e53 (patch)
treef61af7e142de97e916f27b7b4e57dd1d4fabe14f /openstackclient/volume/client.py
parent6c5f2e39e23a11236986b119974b90bf15f73878 (diff)
downloadpython-openstackclient-2cc3a2fdbddb10cc26ffb49e4a7cfa114a1e9e53.tar.gz
Skip auth in cinderclient
cinderclient can't work well with keystone v3 auth info. We should do it in openstackclient just like compute extension. Closes-Bug: #1315963 Change-Id: I46f794c5315f6a9fe1d9a0e5dc7b84f067d7f792
Diffstat (limited to 'openstackclient/volume/client.py')
-rw-r--r--openstackclient/volume/client.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/openstackclient/volume/client.py b/openstackclient/volume/client.py
index 2d824372..7cf828b4 100644
--- a/openstackclient/volume/client.py
+++ b/openstackclient/volume/client.py
@@ -52,6 +52,17 @@ def make_client(instance):
http_log_debug=http_log_debug
)
+ # Populate the Cinder client to skip another auth query to Identity
+ if instance._url:
+ # token flow
+ client.client.management_url = instance._url
+ else:
+ # password flow
+ client.client.management_url = instance.get_endpoint_for_service_type(
+ API_NAME)
+ client.client.service_catalog = instance._service_catalog
+ client.client.auth_token = instance._token
+
return client