commit a935193bae71ec5830e3e185e1f096f0925bbce9
author Jenkins <jenkins@review.openstack.org> Tue Jan 31 00:42:27 2017 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 31 00:42:28 2017 +0000
tree 4206e6d4b2bd054d973dc4a164f4838b21c1ee8f
parent 5c6aa56e11b2dc79adc70154187d3a029e8e0976
parent 92575baa6b010ec09fea3e715030da8be61c0c64

Merge "tempest: configure compute-feature-enabled.swap_volume if libvirt"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 3312522..050ac38 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -507,13 +507,17 @@
         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``