From 5c64a463d87a6b49807a641fa457be040740204a Mon Sep 17 00:00:00 2001 From: Bob Ball Date: Wed, 16 Jul 2014 13:14:11 +0100 Subject: [PATCH] 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 --- stackrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stackrc b/stackrc index 4d3e8fc024..a05fc1851a 100644 --- a/stackrc +++ b/stackrc @@ -363,7 +363,8 @@ case "$VIRT_DRIVER" in IMAGE_URLS=${IMAGE_URLS:-"http://partnerweb.vmware.com/programs/vmdkimage/cirros-0.3.2-i386-disk.vmdk"};; xenserver) DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.0-x86_64-disk} - IMAGE_URLS=${IMAGE_URLS:-"https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz"};; + IMAGE_URLS=${IMAGE_URLS:-"https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz"} + IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";; *) # Default to Cirros with kernel, ramdisk and disk image DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec} IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"};;