Merge "XenAPI: Fix disk_formats verified by tempest"

This commit is contained in:
Jenkins 2016-01-19 07:04:48 +00:00 committed by Gerrit Code Review
commit 2d9f777cc0

View File

@ -289,6 +289,9 @@ function configure_tempest {
if [[ ! -z "$TEMPEST_HTTP_IMAGE" ]]; then if [[ ! -z "$TEMPEST_HTTP_IMAGE" ]]; then
iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE
fi fi
if [ "$VIRT_DRIVER" = "xenserver" ]; then
iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"
fi
# Image Features # Image Features
iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True