diff options
Diffstat (limited to 'functest/utils/openstack_utils.py')
| -rwxr-xr-x | functest/utils/openstack_utils.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py index 10aaf5034..1aac869eb 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(): |