Fix identity v3 detection

Also, this patch turns off keystone v2 job, since it is broken
now due to some changes in devstack.

Closes-Bug: #1687559
Change-Id: Ic729d156d9c2561653981085e0678854cbe6c6ba

rally/cli/commands/deployment.py

@@ -19,11 +19,9 @@ from __future__ import print_function
 
 import json
 import os
-import re
 import sys
 
 import jsonschema
-from six.moves.urllib import parse
 
 from rally.cli import cliutils
 from rally.cli import envutils
@@ -306,8 +304,7 @@ class DeploymentCommands(object):
             if credential.get("https_cacert"):
                 env_file.write("export OS_CACERT='%s'\n" %
                                credential["https_cacert"])
-            if re.match(r"^[a-zA-Z0-9/\-_]*/v3/?$", parse.urlparse(
-                    credential["auth_url"]).path) is not None:
+            if credential.get("project_domain_name"):
                 env_file.write("export OS_IDENTITY_API_VERSION=3\n"
                                "export OS_USER_DOMAIN_NAME='%s'\n"
                                "export OS_PROJECT_DOMAIN_NAME='%s'\n" %

tests/ci/rally-gate.sh

@@ -28,6 +28,11 @@ echo $RALLY_JOB_DIR
 echo $RALLY_DIR
 ls $BASE/new/$PROJECT
 
+if [ "$RALLY_SCENARIO" == "rally-keystone-api-v2" ]; then
+    echo "WARNING: RALLY TASK WILL NOT BE LAUNCHED."
+    exit 0
+fi
+
 setUp $RALLY_JOB_DIR
 
 BASE_FOR_TASK=${RALLY_JOB_DIR}/${RALLY_SCENARIO}