@@ -507,13 +507,17 @@ function configure_tempest {

         iniset $TEMPEST_CONFIG compute-feature-enabled suspend False

     fi

-    # Libvirt-LXC

-    if [ "$VIRT_DRIVER" = "libvirt" ] && [ "$LIBVIRT_TYPE" = "lxc" ]; then

-        iniset $TEMPEST_CONFIG compute-feature-enabled rescue False

-        iniset $TEMPEST_CONFIG compute-feature-enabled resize False

-        iniset $TEMPEST_CONFIG compute-feature-enabled shelve False

-        iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False

-        iniset $TEMPEST_CONFIG compute-feature-enabled suspend False

+    # Libvirt

+    if [ "$VIRT_DRIVER" = "libvirt" ]; then

+        # Libvirt-LXC

+        if [ "$LIBVIRT_TYPE" = "lxc" ]; then

+            iniset $TEMPEST_CONFIG compute-feature-enabled rescue False

+            iniset $TEMPEST_CONFIG compute-feature-enabled resize False

+            iniset $TEMPEST_CONFIG compute-feature-enabled shelve False

+            iniset $TEMPEST_CONFIG compute-feature-enabled snapshot False

+            iniset $TEMPEST_CONFIG compute-feature-enabled suspend False

+        fi

+        iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume True

     fi

     # ``service_available``