Skip to content

Commit 5c64a46

Browse files
author
Bob Ball
committed
XenAPI: Always add latest Cirros euc image
Some tests, such as test_minimum_basic_scenario, assume qcow and if a qcow image does not exit, falls back to the euc image. This change ensures these tests work in the stock XenServer environment. Change-Id: I718f178f7e5e0fa4eebd17a49caf5254124092e3
1 parent 5e93727 commit 5c64a46

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

stackrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,8 @@ case "$VIRT_DRIVER" in
363363
IMAGE_URLS=${IMAGE_URLS:-"http://partnerweb.vmware.com/programs/vmdkimage/cirros-0.3.2-i386-disk.vmdk"};;
364364
xenserver)
365365
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.0-x86_64-disk}
366-
IMAGE_URLS=${IMAGE_URLS:-"https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz"};;
366+
IMAGE_URLS=${IMAGE_URLS:-"https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz"}
367+
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";;
367368
*) # Default to Cirros with kernel, ramdisk and disk image
368369
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec}
369370
IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"};;

0 commit comments

Comments
 (0)