From 6e6b26748351888ebc0b8213c5b0583a23418b6e Mon Sep 17 00:00:00 2001 From: helenyao Date: Thu, 8 Dec 2016 05:31:49 -0500 Subject: Support rally configuration for both Newton and Mitaka JIRA: FUNCTEST-644 As the RC file is different between Newton and Mitaka, the rally configuration file differs in two versions of openstack. Change-Id: Ibf06b7d1f0da87f155a95a152bb78ee7c2b9eb7d Signed-off-by: helenyao --- functest/utils/openstack_utils.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py index 10aaf503..1aac869e 100755 --- a/functest/utils/openstack_utils.py +++ b/functest/utils/openstack_utils.py @@ -133,7 +133,14 @@ def source_credentials(rc_file): def get_credentials_for_rally(): creds = get_credentials("keystone") - admin_keys = ['username', 'tenant_name', 'password'] + keystone_api_version = os.getenv('OS_IDENTITY_API_VERSION') + if (keystone_api_version is None or + keystone_api_version == '2'): + admin_keys = ['username', 'tenant_name', 'password'] + else: + admin_keys = ['username', 'password', 'user_domain_name', + 'project_name', 'project_domain_name'] + endpoint_types = [('internalURL', 'internal'), ('publicURL', 'public'), ('adminURL', 'admin')] if 'endpoint_type' in creds.keys(): -- cgit 1.2.3-korg