openstack/python-heatclient
Code Issues Proposed changes

Merge "Pass correct arguments in osc plugin"

Browse Source
This commit is contained in:
Jenkins
2016-07-01 10:37:10 +00:00
committed by Gerrit Code Review
parent df4776a26a f0823b015b
commit da206ab509
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
heatclient/osc/plugin.py
View File

@@ -39,14 +39,17 @@ def make_client(instance):
interface=instance._interface,
)
client = heat_client(
endpoint=endpoint,
session=instance.session,
auth_url=instance._auth_url,
username=instance._username,
password=instance._password,
region_name=instance._region_name,
)
kwargs = {'endpoint': endpoint,
'auth_url': instance._auth_url,
'region_name': instance._region_name,
'username': instance.auth_ref.username}
if instance.session:
kwargs.update(session=instance.session)
else:
kwargs.update(token=instance.auth_ref.auth_token)
client = heat_client(**kwargs)
return client