openstack/deb-murano
Code Issues Proposed changes

Replace deprecated tempest config option

Browse Source 
In patch https://review.openstack.org/#/c/211601/13
config sections in tempest for admin authentication
become deprecated and if we need to get an admin username
we can't find it in identity section anymore.

This patch replaces identity config section call to auth
in tempest_utils.py

Change-Id: I9a0d07009c9fe8e46066c50c05fa1fa5263bc84e
Closes-Bug: #1503764
This commit is contained in:
Victor Ryzhenkin 2015-10-07 19:50:49 +03:00
parent 6387263bed
commit 2b04624115
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
murano/tests/functional/common/tempest_utils.py
View File

@ -28,9 +28,9 @@ class TempestDeployTestMixin(common_utils.DeployTestMixin):
@staticmethod
@common_utils.memoize
def keystone_client():
return ksclient.Client(username=CONF.identity.admin_username,
password=CONF.identity.admin_password,
tenant_name=CONF.identity.admin_tenant_name,
return ksclient.Client(username=CONF.auth.admin_username,
password=CONF.auth.admin_password,
tenant_name=CONF.auth.admin_tenant_name,
auth_url=CONF.identity.uri)
@staticmethod
@ -38,9 +38,9 @@ class TempestDeployTestMixin(common_utils.DeployTestMixin):
def congress_client():
auth = keystoneclient.auth.identity.v2.Password(
auth_url=CONF.identity.uri,
username=CONF.identity.admin_username,
password=CONF.identity.admin_password,
tenant_name=CONF.identity.admin_tenant_name)
username=CONF.auth.admin_username,
password=CONF.auth.admin_password,
tenant_name=CONF.auth.admin_tenant_name)
session = keystoneclient.session.Session(auth=auth)
return cclient.Client(session=session,
service_type='policy')