@@ -415,14 +415,11 @@ function configure_tempest {

         iniset $TEMPEST_CONFIG scenario img_disk_format vhd

         iniset $TEMPEST_CONFIG scenario img_container_format ovf

     else

-        SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}

-        SCENARIO_IMAGE_FILE="cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img"

+        SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}

+        SCENARIO_IMAGE_FILE=$DEFAULT_IMAGE_NAME

     fi

     iniset $TEMPEST_CONFIG scenario img_dir $SCENARIO_IMAGE_DIR

     iniset $TEMPEST_CONFIG scenario img_file $SCENARIO_IMAGE_FILE

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

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

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

     # If using provider networking, use the physical network for validation rather than private

     TEMPEST_SSH_NETWORK_NAME=$PRIVATE_NETWORK_NAME

@@ -634,9 +634,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then

                 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-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs}

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

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

-                    DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}

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

+                *) # otherwise, use the qcow image

+                    DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}

+                    IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";;

                 esac

             ;;

         vsphere)

@@ -650,9 +650,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then

             # NOTE(lucasagomes): The logic setting the default image

             # now lives in the Ironic tree

             ;;

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

-            DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}

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

+        *) # Default to Cirros qcow2 image file

+            DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}

+            IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";;

     esac

     DOWNLOAD_DEFAULT_IMAGES=False

 fi