openstack
/
heat
Code Issues Proposed changes

Merge "Pin the target keystone endpoint to the context auth url"

This commit is contained in:
Jenkins 2015-03-18 03:09:47 +00:00 committed by Gerrit Code Review
parent f00a216c52 62a438f894
commit a49e2f3e3b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
View File

@ -65,6 +65,7 @@ class KeystoneClientV2(object):
def _v2_client_init(self):
kwargs = {
'auth_url': self.context.auth_url,
'endpoint': self.context.auth_url,
'region_name': cfg.CONF.region_name_for_services
}

3
contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
View File

@ -52,6 +52,7 @@ class KeystoneClientTest(common.HeatTestCase):
if method == 'token':
heat_keystoneclient.kc.Client(
auth_url=mox.IgnoreArg(),
endpoint=mox.IgnoreArg(),
tenant_name='test_tenant',
token='abcd1234',
cacert=None,
@ -63,6 +64,7 @@ class KeystoneClientTest(common.HeatTestCase):
elif method == 'password':
heat_keystoneclient.kc.Client(
auth_url=mox.IgnoreArg(),
endpoint=mox.IgnoreArg(),
tenant_name='test_tenant',
tenant_id='test_tenant_id',
username='test_username',
@ -76,6 +78,7 @@ class KeystoneClientTest(common.HeatTestCase):
if method == 'trust':
heat_keystoneclient.kc.Client(
auth_url='http://server.test:5000/v2.0',
endpoint='http://server.test:5000/v2.0',
password='verybadpass',
tenant_name='service',
username='heat',