commit dd2d52b2a9545b6db669770886b18e616d437924
author Jenkins <jenkins@review.openstack.org> Thu Nov 13 17:05:49 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Nov 13 17:05:49 2014 +0000
tree f47bf9a2420f6f6662dc8eb5bc12de3ce5aabf10
parent 1c2a47e7346383ef44e89cd34622d153326eb1e7
parent 28684f3b1a2abd28cf1a6b35a16f54776af1e56f

Merge "Don't setup identity v3 client if v3 is disabled"

tempest/clients.py

diff --git a/tempest/clients.py b/tempest/clients.py
index 19b4e11..438d386 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -291,7 +291,8 @@
                 self.telemetry_client = TelemetryClientXML(
                     self.auth_provider)
             self.token_client = TokenClientXML()
-            self.token_v3_client = V3TokenClientXML()
+            if CONF.identity_feature_enabled.api_v3:
+                self.token_v3_client = V3TokenClientXML()
             self.volume_availability_zone_client = \
                 VolumeAvailabilityZoneClientXML(self.auth_provider)
             self.volume_v2_availability_zone_client = \
@@ -397,7 +398,8 @@
                 self.telemetry_client = TelemetryClientJSON(
                     self.auth_provider)
             self.token_client = TokenClientJSON()
-            self.token_v3_client = V3TokenClientJSON()
+            if CONF.identity_feature_enabled.api_v3:
+                self.token_v3_client = V3TokenClientJSON()
             self.negative_client = rest_client.NegativeRestClient(
                 self.auth_provider)
             self.negative_client.service = service