@@ -55,7 +55,7 @@ BUILD_INTERVAL=1

 BUILD_TIMEOUT=196

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

+BOTO_MATERIALS_PATH="$FILES/images/s3-materials/cirros-${CIRROS_VERSION}"

 # Cinder/Volume variables

 TEMPEST_VOLUME_DRIVER=${TEMPEST_VOLUME_DRIVER:-default}

@@ -305,9 +305,9 @@ function configure_tempest {

     iniset $TEMPEST_CONFIG boto ec2_url "http://$SERVICE_HOST:8773/services/Cloud"

     iniset $TEMPEST_CONFIG boto s3_url "http://$SERVICE_HOST:${S3_SERVICE_PORT:-3333}"

     iniset $TEMPEST_CONFIG boto s3_materials_path "$BOTO_MATERIALS_PATH"

-    iniset $TEMPEST_CONFIG boto ari_manifest cirros-0.3.1-x86_64-initrd.manifest.xml

-    iniset $TEMPEST_CONFIG boto ami_manifest cirros-0.3.1-x86_64-blank.img.manifest.xml

-    iniset $TEMPEST_CONFIG boto aki_manifest cirros-0.3.1-x86_64-vmlinuz.manifest.xml

+    iniset $TEMPEST_CONFIG boto ari_manifest cirros-${CIRROS_VERSION}-x86_64-initrd.manifest.xml

+    iniset $TEMPEST_CONFIG boto ami_manifest cirros-${CIRROS_VERSION}-x86_64-blank.img.manifest.xml

+    iniset $TEMPEST_CONFIG boto aki_manifest cirros-${CIRROS_VERSION}-x86_64-vmlinuz.manifest.xml

     iniset $TEMPEST_CONFIG boto instance_type "$boto_instance_type"

     iniset $TEMPEST_CONFIG boto http_socket_timeout 30

     iniset $TEMPEST_CONFIG boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}

@@ -327,7 +327,10 @@ function configure_tempest {

     fi

     # Scenario

-    iniset $TEMPEST_CONFIG scenario img_dir "$FILES/images/cirros-0.3.1-x86_64-uec"

+    iniset $TEMPEST_CONFIG scenario img_dir "$FILES/images/cirros-${CIRROS_VERSION}-x86_64-uec"

+    iniset $TEMPEST_CONFIG scenario ami_img_file "cirros-${CIRROS_VERSION}-x86_64-blank.img"

+    iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-x86_64-initrd"

+    iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-x86_64-vmlinuz"

     # Large Ops Number

     iniset $TEMPEST_CONFIG scenario large_ops_number ${TEMPEST_LARGE_OPS_NUMBER:-0}

@@ -408,8 +411,8 @@ function install_tempest {

 # init_tempest() - Initialize ec2 images

 function init_tempest {

-    local base_image_name=cirros-0.3.1-x86_64

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

+    local base_image_name=cirros-${CIRROS_VERSION}-x86_64

+    # /opt/stack/devstack/files/images/cirros-${CIRROS_VERSION}-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"

@@ -305,12 +305,14 @@ esac

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

 #    example:

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

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

+#      http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-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://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img" # cirros full disk image

+#IMAGE_URLS="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img" # cirros full disk image

+

+CIRROS_VERSION=${CIRROS_VERSION:-"0.3.2"}

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

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

@@ -322,11 +324,11 @@ 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.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"};;

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

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

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

-                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"};;

+                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"};;

         esac

         ;;

     vsphere)

@@ -336,8 +338,8 @@ case "$VIRT_DRIVER" in

         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"};;

     *) # Default to Cirros with kernel, ramdisk and disk image

-        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"};;

+        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"};;

 esac

 # Use 64bit fedora image if heat is enabled

@@ -97,7 +97,7 @@ Of course, use real passwords if this machine is exposed.

     # Download a vhd and a uec image

     IMAGE_URLS="\

     https://github.com/downloads/citrix-openstack/warehouse/cirros-0.3.0-x86_64-disk.vhd.tgz,\

-    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"

     # Explicitly set virt driver

     VIRT_DRIVER=xenserver