Browse code

Merge "XenAPI: Fix disk_formats verified by tempest" into stable/liberty

Jenkins authored on 2016/02/28 23:38:45
Showing 1 changed files
... ...
@@ -338,7 +338,9 @@ function configure_tempest {
338 338
     if [[ ! -z "$TEMPEST_HTTP_IMAGE" ]]; then
339 339
         iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE
340 340
     fi
341
-    iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image true
341
+    if [ "$VIRT_DRIVER" = "xenserver" ]; then
342
+        iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"
343
+    fi
342 344
 
343 345
     # Image Features
344 346
     iniset $TEMPEST_CONFIG image-feature-enabled deactivate_image True