Merge "Don't run swap_volume tests in Tempest if cells v1 is enabled"

Jenkins · openstack-gerrit · commit e6f8dbb55fc8 · 2017-01-31T13:16:08.000Z
diff --git a/lib/tempest b/lib/tempest
@@ -516,8 +516,10 @@ function configure_tempest {
             iniset $TEMPEST_CONFIG compute-feature-enabled shelve False
             iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False
             iniset $TEMPEST_CONFIG compute-feature-enabled suspend False
+        elif ! is_service_enabled n-cell; then
+            # cells v1 does not support swapping volumes
+            iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True
         fi
-        iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True
     fi
 
     # ``service_available``
