1. devstack
  2. Commit 5c64a463d87a6b49807a641fa457be040740204a
Browse code

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

Bob Ball authored on 2014/07/16 21:14:11
Showing 1 changed files
stackrc
History View file @ 5c64a46
... ... 
@@ -363,7 +363,8 @@ case "$VIRT_DRIVER" in
363 363 
         IMAGE_URLS=${IMAGE_URLS:-"http://partnerweb.vmware.com/programs/vmdkimage/cirros-0.3.2-i386-disk.vmdk"};;
364 364 
     xenserver)
365 365 
         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";;
367 368 
     *) # Default to Cirros with kernel, ramdisk and disk image
368 369 
         DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec}
369 370 
         IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"};;