commit 4780df58e76e36e30bea02a1b58ed5a38aa3c988
author Jenkins <jenkins@review.openstack.org> Sat Aug 23 10:55:21 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Aug 23 10:55:21 2014 +0000
tree 8cd61760d0c809586969654f8f60d3d409cbbcee
parent 8d004e67596f70266ade51276b0d8ecbd92b493e
parent 1fdc78a277d1aa11cda851a6bf31f500d27a6d78

Merge "Running without keystone v3 doesn't require uri_v3"

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 d57b931..0522f37 100644
--- a/tempest/services/identity/v3/json/identity_client.py
+++ b/tempest/services/identity/v3/json/identity_client.py
@@ -525,7 +525,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 c2bd77e..5b761b3 100644
--- a/tempest/services/identity/v3/xml/identity_client.py
+++ b/tempest/services/identity/v3/xml/identity_client.py
@@ -520,7 +520,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')