openstack
/
heat
Code Issues Proposed changes

Merge "Don't use scoping information for admin auth"

This commit is contained in:
Jenkins 2015-05-12 13:22:33 +00:00 committed by Gerrit Code Review
parent 3b5d8cc84a 83b8d6d116
commit 4032e40cce
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/common/heat_keystoneclient.py
View File

@ -127,9 +127,7 @@ class KeystoneClientV3(object):
username=cfg.CONF.keystone_authtoken.admin_user, username=cfg.CONF.keystone_authtoken.admin_user,
password=cfg.CONF.keystone_authtoken.admin_password, password=cfg.CONF.keystone_authtoken.admin_password,
user_domain_id='default', user_domain_id='default',
auth_url=self.v3_endpoint, auth_url=self.v3_endpoint)
project_name=cfg.CONF.keystone_authtoken.admin_tenant_name,
project_domain_id='default')
return self._admin_auth return self._admin_auth

2
heat/tests/test_heatclient.py
View File

@ -81,8 +81,6 @@ class KeystoneClientTest(common.HeatTestCase):
m = ks_auth_v3.Password(auth_url='http://server.test:5000/v3', m = ks_auth_v3.Password(auth_url='http://server.test:5000/v3',
password='verybadpass', password='verybadpass',
user_domain_id='default', user_domain_id='default',
project_name='service',
project_domain_id='default',
username='heat') username='heat')
m.AndReturn(mock_ks_auth) m.AndReturn(mock_ks_auth)