commit 89a8a15ebe31f4b06e40ecadd4918e687087874c
author Jenkins <jenkins@review.openstack.org> Tue Jul 22 01:14:19 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jul 22 01:14:19 2014 +0000
tree ced9794cf40f1cba235aa6a0246e6c00e36d6871
parent 2ebcd3817f6b9f18ddb408026ac07f48d0bea801
parent 5c64a463d87a6b49807a641fa457be040740204a

Merge "XenAPI: Always add latest Cirros euc image"

stackrc

diff --git a/stackrc b/stackrc
index 4d3e8fc..a05fc18 100644
--- a/stackrc
+++ b/stackrc
@@ -363,7 +363,8 @@
         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"};;