openstack/devstack
Code Issues Proposed changes

Merge "Disable shelve/snapshot/cinder when running Tempest with libvirt+lxc"

Browse Source
This commit is contained in:
Jenkins 2015-10-29 05:09:35 +00:00 committed by Gerrit Code Review
commit ff113c01dd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tempest
View File

@ -518,6 +518,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
@ -535,6 +537,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