commit add5b7d6422cbd2199766410c2ff7892420c4119
author Jenkins <jenkins@review.openstack.org> Fri Dec 12 15:31:43 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Dec 12 15:31:43 2014 +0000
tree 71a6bb0a67842c9e0a6a1af7006873222af08ac9
parent cc4b3bc586ef545c737c418371db6882976030ac
parent e8dfd67c5564800cdd4630b73a59aaef11972148

Merge "Remove Nova v3 API code from RestClient"

tempest/common/rest_client.py

diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index c25aa8d..c54f698 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -153,11 +153,6 @@
             if catalog_type == service:
                 endpoint_type = getattr(cfg, 'endpoint_type', 'publicURL')
                 break
-        # Special case for compute v3 service which hasn't its own
-        # configuration group
-        else:
-            if service == CONF.compute.catalog_v3_type:
-                endpoint_type = CONF.compute.endpoint_type
         return endpoint_type
 
     @property