commit c0f492de070780884c6e5e00b6bd305cf9925d45
author Jenkins <jenkins@review.openstack.org> Mon Mar 27 19:33:46 2017 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 27 19:33:46 2017 +0000
tree 2d57b3fc7094bb1568e8e8c03752c22cea6b9a21
parent 877811f92f5d315b403de6e8928720e95d4ce861
parent 5afcb343d856f15bae76c998db3b396c47b958d6

Merge "Remove cinder clients api version 1"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 727afd6..cbe1b14 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -79,13 +79,8 @@
         cls.security_groups_client = cls.manager.security_groups_client
         cls.security_group_rules_client = (
             cls.manager.security_group_rules_client)
-
-        if CONF.volume_feature_enabled.api_v2:
-            cls.volumes_client = cls.manager.volumes_v2_client
-            cls.snapshots_client = cls.manager.snapshots_v2_client
-        else:
-            cls.volumes_client = cls.manager.volumes_client
-            cls.snapshots_client = cls.manager.snapshots_client
+        cls.volumes_client = cls.manager.volumes_v2_client
+        cls.snapshots_client = cls.manager.snapshots_v2_client
 
     # ## Test functions library
     #