@@ -531,6 +531,8 @@ function configure_tempest {

     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

     fi

@@ -548,6 +550,12 @@ function configure_tempest {

         fi

     done

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

+        # libvirt-lxc does not support boot from volume or attaching volumes

+        # so basically anything with cinder is out of the question.

+        iniset $TEMPEST_CONFIG service_available cinder "False"

+    fi

+

     if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then

         # Use the ``BOTO_CONFIG`` environment variable to point to this file

         iniset -sudo $BOTO_CONF Boto ca_certificates_file $SSL_BUNDLE_FILE