commit 1fdc78a277d1aa11cda851a6bf31f500d27a6d78
author ajayaa <ajku.agr@gmail.com> Wed Jul 09 16:51:13 2014 +0530
committer ajayaa <ajku.agr@gmail.com> Wed Jul 09 17:02:48 2014 +0530
tree 6a7537676eb9ae1213b69e5e5c8f1c91f4a33b9d
parent 20fdc88a9ef28ac264432123b6d7eb8adf03824b

Running without keystone v3 doesn't require uri_v3

uri_v3 is not required if api_v3 is false.

Change-Id: I5d63ca38b9f07ea07383472fb7fa82b369c72216
Closes-bug: #1295132

tempest/services/identity/v3/json/identity_client.py

diff --git a/tempest/services/identity/v3/json/identity_client.py b/tempest/services/identity/v3/json/identity_client.py
index 6829333..e1e10d7 100644
--- a/tempest/services/identity/v3/json/identity_client.py
+++ b/tempest/services/identity/v3/json/identity_client.py
@@ -456,7 +456,7 @@
     def __init__(self):
         super(V3TokenClientJSON, self).__init__(None)
         auth_url = CONF.identity.uri_v3
-        if not auth_url and CONF.identity_feature_enabled.api_v3:
+        if not auth_url:
             raise exceptions.InvalidConfiguration('you must specify a v3 uri '
                                                   'if using the v3 identity '
                                                   'api')

tempest/services/identity/v3/xml/identity_client.py

diff --git a/tempest/services/identity/v3/xml/identity_client.py b/tempest/services/identity/v3/xml/identity_client.py
index 35295d7..053ae13 100644
--- a/tempest/services/identity/v3/xml/identity_client.py
+++ b/tempest/services/identity/v3/xml/identity_client.py
@@ -450,7 +450,7 @@
     def __init__(self):
         super(V3TokenClientXML, self).__init__(None)
         auth_url = CONF.identity.uri_v3
-        if not auth_url and CONF.identity_feature_enabled.api_v3:
+        if not auth_url:
             raise exceptions.InvalidConfiguration('you must specify a v3 uri '
                                                   'if using the v3 identity '
                                                   'api')