@@ -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``