diff options
| author | tamilhce <tamilhce@gmail.com> | 2016-09-09 09:25:41 +0530 |
|---|---|---|
| committer | rabi <ramishra@redhat.com> | 2016-09-09 10:01:39 +0530 |
| commit | f2147f79aaa42aedbb8c3413151fade301f468e8 (patch) | |
| tree | 440bdad104e770a30154e0317211584897b8cd5f /heatclient/osc | |
| parent | dde6bc4d4fcf0461ca3907ce87693673f9a3325d (diff) | |
| download | python-heatclient-f2147f79aaa42aedbb8c3413151fade301f468e8.tar.gz | |
Don't use endpoint_override with session
We should not use endpoint_override by default and rather
use service_type with session. This also refactors some of
the associated code.
However, if one wants to override the endpoint they can pass
endpoint_override to the client constructor along with session.
Change-Id: I7c27d8ff827de3b4bb3e70457c0b6a3f47b6d7bb
Co-Authored-By: Rabi Mishra <ramishra@redhat.com>
Closes-Bug: #1621505
Diffstat (limited to 'heatclient/osc')
| -rw-r--r-- | heatclient/osc/plugin.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/heatclient/osc/plugin.py b/heatclient/osc/plugin.py index 32c0e15..b57d2de 100644 --- a/heatclient/osc/plugin.py +++ b/heatclient/osc/plugin.py @@ -33,22 +33,23 @@ def make_client(instance): API_VERSIONS) LOG.debug('Instantiating orchestration client: %s', heat_client) - # Note: We can change '_interface' and '_region_name' once - # the requirements change to python-openstackclient-2.6.1 - endpoint = instance.get_endpoint_for_service_type( - API_NAME, - region_name=instance._region_name, - interface=instance._interface, - ) - - kwargs = {'endpoint': endpoint, - 'auth_url': instance.auth.auth_url, - 'region_name': instance._region_name, - 'username': instance.auth_ref.username} - if instance.session: - kwargs.update(session=instance.session) + kwargs = {'session': instance.session, + 'service_type': API_NAME} else: + # Note: We can change '_interface' and '_region_name' once + # the requirements change to python-openstackclient-2.6.1 + endpoint = instance.get_endpoint_for_service_type( + API_NAME, + region_name=instance._region_name, + interface=instance._interface, + ) + + kwargs = {'endpoint': endpoint, + 'auth_url': instance.auth.auth_url, + 'region_name': instance._region_name, + 'username': instance.auth_ref.username} + kwargs.update(token=instance.auth_ref.auth_token) client = heat_client(**kwargs) |