Browse code

Update default Cirros to 0.3.2

Update the default Cirros version to 0.3.2 in order for the hostname to be set
to the server name.

Fixes bug 1435943

Change-Id: I6bfe1b1dfbae3d45ecd1643582916fc1441bf78f

Joseph Lanoux authored on 2015/03/25 02:00:55
Showing 1 changed files
... ...
@@ -429,10 +429,10 @@ case "$VIRT_DRIVER" in
429 429
     libvirt)
430 430
         case "$LIBVIRT_TYPE" in
431 431
             lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc
432
-                DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-rootfs}
433
-                IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-rootfs.img.gz"};;
432
+                DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.2-x86_64-rootfs}
433
+                IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-rootfs.img.gz"};;
434 434
             *) # otherwise, use the uec style image (with kernel, ramdisk, disk)
435
-                DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}
435
+                DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.2-x86_64-uec}
436 436
                 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"};;
437 437
         esac
438 438
         ;;
... ...
@@ -444,7 +444,7 @@ case "$VIRT_DRIVER" in
444 444
         IMAGE_URLS=${IMAGE_URLS:-"https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz"}
445 445
         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";;
446 446
     *) # Default to Cirros with kernel, ramdisk and disk image
447
-        DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}
447
+        DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.2-x86_64-uec}
448 448
         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"};;
449 449
 esac
450 450