Merge "Fix keystone.py 'get_service_url' method parameter" into stable/ocata
This commit is contained in:
commit
9ee06e4f8e
|
@ -128,7 +128,7 @@ def get_service_url(session, service_type='baremetal',
|
|||
"""
|
||||
return session.get_endpoint(service_type=service_type,
|
||||
interface=endpoint_type,
|
||||
region=CONF.keystone.region_name)
|
||||
region_name=CONF.keystone.region_name)
|
||||
|
||||
|
||||
@ks_exceptions
|
||||
|
|
|
@ -57,7 +57,7 @@ class KeystoneTestCase(base.TestCase):
|
|||
mock_sess.get_endpoint.return_value = fake_url
|
||||
res = keystone.get_service_url(mock_sess)
|
||||
mock_sess.get_endpoint.assert_called_with(
|
||||
interface='internal', region='fake_region',
|
||||
interface='internal', region_name='fake_region',
|
||||
service_type='baremetal')
|
||||
self.assertEqual(fake_url, res)
|
||||
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
fixes:
|
||||
- Fixes multi-region issue when region specified in config file
|
||||
was ignored when getting keystone service url.
|
Loading…
Reference in New Issue