@@ -48,7 +48,7 @@ BUILD_INTERVAL=3

 BUILD_TIMEOUT=400

-BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-0.3.0"

+BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-0.3.1"

 # Entry Points

 # ------------

@@ -273,8 +273,8 @@ function install_tempest() {

 # init_tempest() - Initialize ec2 images

 function init_tempest() {

-    local base_image_name=cirros-0.3.0-x86_64

-    # /opt/stack/devstack/files/images/cirros-0.3.0-x86_64-uec

+    local base_image_name=cirros-0.3.1-x86_64

+    # /opt/stack/devstack/files/images/cirros-0.3.1-x86_64-uec

     local image_dir="$FILES/images/${base_image_name}-uec"

     local kernel="$image_dir/${base_image_name}-vmlinuz"

     local ramdisk="$image_dir/${base_image_name}-initrd"

@@ -1215,8 +1215,9 @@ fi

 # Upload an image to glance.

 #

 # The default image is cirros, a small testing image which lets you login as **root**

-# cirros also uses ``cloud-init``, supporting login via keypair and sending scripts as

-# userdata.  See https://help.ubuntu.com/community/CloudInit for more on cloud-init

+# cirros has a ``cloud-init`` analog supporting login via keypair and sending

+# scripts as userdata.

+# See https://help.ubuntu.com/community/CloudInit for more on cloud-init

 #

 # Override ``IMAGE_URLS`` with a comma-separated list of UEC images.

 #  * **oneiric**: http://uec-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64.tar.gz

@@ -167,12 +167,12 @@ fi

 #    glance as a disk image.  If it ends in .gz, it is uncompressed first.

 #    example:

 #      http://cloud-images.ubuntu.com/releases/oneiric/release/ubuntu-11.10-server-cloudimg-armel-disk1.img

-#      http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz

+#      http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-rootfs.img.gz

 #  * OpenVZ image:

 #    OpenVZ uses its own format of image, and does not support UEC style images

 #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

-#IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" # cirros full disk image

+#IMAGE_URLS="http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img" # cirros full disk image

 # Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of

 # which may be set in ``localrc``.  Also allow ``DEFAULT_IMAGE_NAME`` and

@@ -184,16 +184,16 @@ case "$VIRT_DRIVER" in

     libvirt)

         case "$LIBVIRT_TYPE" in

             lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc

-                DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.0-x86_64-rootfs}

-                IMAGE_URLS=${IMAGE_URLS:-"http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz"};;

+                DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-rootfs}

+                IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-rootfs.img.gz"};;

             *) # otherwise, use the uec style image (with kernel, ramdisk, disk)

-                DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.0-x86_64-uec}

-                IMAGE_URLS=${IMAGE_URLS:-"http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz"};;

+                DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}

+                IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};;

         esac

         ;;

     *) # otherwise, use the uec style image (with kernel, ramdisk, disk)

-        DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.0-x86_64-uec}

-        IMAGE_URLS=${IMAGE_URLS:-"http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz"};;

+        DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-0.3.1-x86_64-uec}

+        IMAGE_URLS=${IMAGE_URLS:-"http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz"};;

 esac

 # 5Gb default volume backing file size