Merge "Set ima_disk_format to vhd when hypervisor is XenServer"
diff --git a/lib/tempest b/lib/tempest
index 3cd300c..caa830b 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -289,6 +289,7 @@
     fi
     if [ "$VIRT_DRIVER" = "xenserver" ]; then
         iniset $TEMPEST_CONFIG image disk_formats "ami,ari,aki,vhd,raw,iso"
+        iniset $TEMPEST_CONFIG scenario img_disk_format vhd
     fi
 
     # Image Features