summaryrefslogtreecommitdiff
path: root/cinderclient/client.py
diff options
context:
space:
mode:
authorQiu Yu <qiuyu@ebaysf.com>2015-08-26 02:56:21 +0800
committerSean McGinnis <sean_mcginnis@dell.com>2016-06-06 08:41:37 -0500
commit03e041a3cd6cbeb51e49076e575b90c29cd0a87c (patch)
tree654eed08484b4de4e369a833346bc410a3be9196 /cinderclient/client.py
parent3d06d358ada4bd1615342a9c08527fd7dc26d8a0 (diff)
downloadpython-cinderclient-03e041a3cd6cbeb51e49076e575b90c29cd0a87c.tar.gz
Make sure --bypass-url honored if specified
Currently SessionClient ignored --bypass-url which is only used with HTTPClient. This change force to use HTTPClient if bypass-url specified. Change-Id: I03d1eec8cfda81efce409399b8d6ca91b779840b Closes-Bug: #1467577
Diffstat (limited to 'cinderclient/client.py')
-rw-r--r--cinderclient/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cinderclient/client.py b/cinderclient/client.py
index 59d4cd0..168a754 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -547,8 +547,8 @@ def _construct_http_client(username=None, password=None, project_id=None,
auth=None, api_version=None,
**kwargs):
- # Don't use sessions if third party plugin is used
- if session and not auth_plugin:
+ # Don't use sessions if third party plugin or bypass_url being used
+ if session and not auth_plugin and not bypass_url:
kwargs.setdefault('user_agent', 'python-cinderclient')
kwargs.setdefault('interface', endpoint_type)
return SessionClient(session=session,