Browse code
Add CirrOS 0.3.2 to image list
In order to change the default in master we need to pre-cache the new image
in the previous release due to Grenade-reasons.
Change-Id: Ic76e6c13418171555135dd7b9440ce031aa8d259
Dean Troyer authored on 2014/05/17 00:58:15Showing 1 changed files
| ... | ... |
@@ -326,7 +326,7 @@ case "$VIRT_DRIVER" in |
| 326 | 326 |
IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-rootfs.img.gz"};;
|
| 327 | 327 |
*) # otherwise, use the uec style image (with kernel, ramdisk, disk) |
| 328 | 328 |
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}
|
| 329 |
- IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};;
|
|
| 329 |
+ IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz,http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz"};;
|
|
| 330 | 330 |
esac |
| 331 | 331 |
;; |
| 332 | 332 |
vsphere) |
| ... | ... |
@@ -337,7 +337,7 @@ case "$VIRT_DRIVER" in |
| 337 | 337 |
IMAGE_URLS=${IMAGE_URLS:-"https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz"};;
|
| 338 | 338 |
*) # Default to Cirros with kernel, ramdisk and disk image |
| 339 | 339 |
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}
|
| 340 |
- IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};;
|
|
| 340 |
+ IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz,http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz"};;
|
|
| 341 | 341 |
esac |
| 342 | 342 |
|
| 343 | 343 |
# if heat is enabled, bring in a linux image with cfn enabled |