openstack/python-heatclient
Code Issues Proposed changes

Merge "Use region_name and interface with session"

Browse Source
This commit is contained in:
Jenkins
2016-10-17 20:59:08 +00:00
committed by Gerrit Code Review
parent a57ea56159 6288620093
commit c14e1827f6
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
heatclient/osc/plugin.py
View File

@@ -33,24 +33,23 @@ def make_client(instance):
API_VERSIONS) API_VERSIONS)
LOG.debug('Instantiating orchestration client: %s', heat_client) LOG.debug('Instantiating orchestration client: %s', heat_client)
kwargs = {'region_name': instance.region_name,
'interface': instance.interface}
if instance.session: if instance.session:
kwargs = {'session': instance.session, kwargs.update({'session': instance.session,
'service_type': API_NAME} 'service_type': API_NAME})
else: 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( endpoint = instance.get_endpoint_for_service_type(
API_NAME, API_NAME,
region_name=instance._region_name, region_name=instance.region_name,
interface=instance._interface, interface=instance.interface,
) )
kwargs = {'endpoint': endpoint, kwargs.update({'endpoint': endpoint,
'auth_url': instance.auth.auth_url, 'auth_url': instance.auth.auth_url,
'region_name': instance._region_name, 'username': instance.auth_ref.username,
'username': instance.auth_ref.username} 'token': instance.auth_ref.auth_token})
kwargs.update(token=instance.auth_ref.auth_token)
client = heat_client(**kwargs) client = heat_client(**kwargs)