| commit | 2d9f777cc076df863af659caeddc9583fba1e1e7 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Jan 19 07:04:48 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Jan 19 07:04:48 2016 +0000 |
| tree | 5c0be7865b258e37445c4921d6061d18767fc78c | |
| parent | 7cca91acf9d7f7b8439eeeb34a66e4626e7c66f6 [diff] | |
| parent | 2dd761b16950603555409e33ac63a196eefd2607 [diff] |
Merge "XenAPI: Fix disk_formats verified by tempest"
diff --git a/lib/tempest b/lib/tempest index dc1e450..329308c 100644 --- a/lib/tempest +++ b/lib/tempest
@@ -289,6 +289,9 @@ 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