commit e6f8dbb55fc8fccb18f4ccb5ed5723a2efc3b025
author Jenkins <jenkins@review.openstack.org> Tue Jan 31 13:16:08 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 31 13:16:08 2017 +0000
tree e0dd1be65b191a18cc05dcdfc33efdfdb36a6d40
parent bd14f7f23e01968aba70f0025b85dc15f110abc1
parent e9a9fbef8fc29437d1f69727e2ab73c31e957488

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

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 050ac38..7cafadb 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -516,8 +516,10 @@
             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``