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

2017-01-31 13:16:08 +00:00
parent bd14f7f23e e9a9fbef8f
commit e6f8dbb55f
1 changed files with 3 additions and 1 deletions
--- 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``