openstack
/
python-heatclient
Code Issues Proposed changes

Make sure the --heat-url option is respected, part 2 

If the endpoint is passed in, make sure keystone uses it instead of
looking up the endpoint in the auth plugin.

Original fix: 9e28993ee6

Closes-Bug: #1654344
Change-Id: I4b42ab9d87c790eef1953f995260b6b232a63445
This commit is contained in:
Jason Dunsmore 2017-01-05 10:54:47 -06:00
parent de271ae757
commit 2cd3db1111
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heatclient/shell.py
View File

@ -544,7 +544,8 @@ class HeatShell(object):
'region_name': args.os_region_name,
'username': args.os_username,
'password': args.os_password,
'include_pass': args.include_password
'include_pass': args.include_password,
'endpoint_override': args.heat_url,
}
client = heat_client.Client(api_version, **kwargs)

9
heatclient/tests/unit/test_shell.py
View File

@ -618,7 +618,8 @@ class ShellTestEndpointType(TestCase):
'region_name': '',
'username': 'username',
'password': 'password',
'include_pass': False
'include_pass': False,
'endpoint_override': mox.IgnoreArg(),
}
http._construct_http_client(**kwargs)
heatclient.v1.shell.do_stack_list(mox.IgnoreArg(), mox.IgnoreArg())
@ -637,7 +638,8 @@ class ShellTestEndpointType(TestCase):
'region_name': '',
'username': 'username',
'password': 'password',
'include_pass': False
'include_pass': False,
'endpoint_override': mox.IgnoreArg(),
}
http._construct_http_client(**kwargs)
heatclient.v1.shell.do_stack_list(mox.IgnoreArg(), mox.IgnoreArg())
@ -658,7 +660,8 @@ class ShellTestEndpointType(TestCase):
'region_name': '',
'username': 'username',
'password': 'password',
'include_pass': False
'include_pass': False,
'endpoint_override': mox.IgnoreArg(),
}
http._construct_http_client(**kwargs)
heatclient.v1.shell.do_stack_list(mox.IgnoreArg(), mox.IgnoreArg())