openstack/python-heatclient
Code Issues Proposed changes

Merge "Use default service_type with session"

Browse Source
This commit is contained in:
Jenkins 2016-12-06 07:19:35 +00:00 committed by Gerrit Code Review
commit 1eb72804d6
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heatclient/common/http.py
View File

@ -349,6 +349,9 @@ def _construct_http_client(endpoint=None, username=None, password=None,
if session: if session:
if 'endpoint_override' not in kwargs and endpoint: if 'endpoint_override' not in kwargs and endpoint:
kwargs['endpoint_override'] = endpoint kwargs['endpoint_override'] = endpoint
elif 'service_type' not in kwargs:
kwargs['service_type'] = 'orchestration'
return SessionClient(session, auth=auth, **kwargs) return SessionClient(session, auth=auth, **kwargs)
else: else:
return HTTPClient(endpoint=endpoint, username=username, return HTTPClient(endpoint=endpoint, username=username,