openstack/python-cinderclient
Code Issues Proposed changes

Merge "Don't use sessions if third party plugin is used"

Browse Source
This commit is contained in:
Jenkins
2015-02-03 15:25:09 +00:00
committed by Gerrit Code Review
parent 2f1939405a 7783767f23
commit eaedc41ddd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cinderclient/client.py
View File

@@ -478,7 +478,8 @@ def _construct_http_client(username=None, password=None, project_id=None,
auth=None, auth=None,
**kwargs): **kwargs):
if session: # Don't use sessions if third party plugin is used
if session and not auth_plugin:
kwargs.setdefault('user_agent', 'python-cinderclient') kwargs.setdefault('user_agent', 'python-cinderclient')
kwargs.setdefault('interface', endpoint_type) kwargs.setdefault('interface', endpoint_type)
return SessionClient(session=session, return SessionClient(session=session,