From 70da0d01f1da50c76231565548f730d3141c76e5 Mon Sep 17 00:00:00 2001 From: Steve Heyman Date: Mon, 11 May 2015 14:11:29 -0500 Subject: [PATCH] Pass in keystone version and correct v2 URL to CLI CLI tests for auth v2 were using the wrong URL, should be CONF.identity.uri and not CONF.identity.auth_uri. Also the CLI requires the keystone version to be pass in (ie "3.0" for keystone v3). Change-Id: I7fd3994022bf4f4575cbffb75f48042d889792a9 --- functionaltests/cli/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functionaltests/cli/base.py b/functionaltests/cli/base.py index 22b9b4f6..6f7384b0 100644 --- a/functionaltests/cli/base.py +++ b/functionaltests/cli/base.py @@ -60,9 +60,11 @@ class CmdLineTestCase(BaseTestCase): arg_list.extend( ['--os-project-domain-name', CONF.keymanager.project_domain_name]) + arg_list.extend(['--os-identity-api-version', '3.0']) else: - arg_list.extend(['--os-auth-url', CONF.identity.auth_uri]) + arg_list.extend(['--os-auth-url', CONF.identity.uri]) arg_list.extend(['--os-tenant-name', CONF.keymanager.project_name]) + arg_list.extend(['--os-identity-api-version', '2.0']) arg_list.extend(['--os-username', CONF.keymanager.username, '--os-password', CONF.keymanager.password])