Browse code

Merge "Update default cirros version"

Jenkins authored on 2015/05/09 03:43:38
Showing 2 changed files
... ...
@@ -536,7 +536,7 @@ esac
536 536
 #IMAGE_URLS="http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz" # old ttylinux-uec image
537 537
 #IMAGE_URLS="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img" # cirros full disk image
538 538
 
539
-CIRROS_VERSION=${CIRROS_VERSION:-"0.3.2"}
539
+CIRROS_VERSION=${CIRROS_VERSION:-"0.3.4"}
540 540
 CIRROS_ARCH=${CIRROS_ARCH:-"x86_64"}
541 541
 
542 542
 # Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of
... ...
@@ -97,7 +97,7 @@ Of course, use real passwords if this machine is exposed.
97 97
     # Download a vhd and a uec image
98 98
     IMAGE_URLS="\
99 99
     https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz,\
100
-    http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-uec.tar.gz"
100
+    http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-uec.tar.gz"
101 101
 
102 102
     # Explicitly set virt driver
103 103
     VIRT_DRIVER=xenserver