Merge "XenAPI: Fix disk_formats verified by tempest"

2016-01-19 07:04:48 +00:00 · 2016-01-19 07:04:48 +00:00 · 2d9f777cc0
commit 2d9f777cc0
parent 7cca91acf9 2dd761b169
1 changed files with 3 additions and 0 deletions
--- a/lib/tempest
+++ b/lib/tempest
@ -289,6 +289,9 @@ function configure_tempest {
    if [[ ! -z "$TEMPEST_HTTP_IMAGE" ]]; then
        iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE
    fi
+    if [ "$VIRT_DRIVER" = "xenserver" ]; then
+        iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"
+    fi

    # Image Features
    iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True