1. devstack
  2. Commit aecfdf55627e7e651228b240eaec179d10b81241
Browse code

Switch devstack to use qcow cirros img

This commit switches devstack to use the published qcow2 cirros image
instead of the AMI version. Using AMI was mostly a historical artifact
dating pretty far back, but in the real world no one really uses AMI
images with openstack clouds. This change reflects that and also
enables tempest ro remove its deprecated config options for using AMI
as a fallback on misconfiguration (which was just there to support
devstack's defaults)

This is need on all branches so that tempest can remove it's deprecated
options. It's also good to use a consistent image on all branches.

Change-Id: Id65ebae73b28da7185cb349b714b659af51ef77f
(cherry picked from commit 14fa51c28b5b767cf78957cab41645457a0d7e33)

Matthew Treinish authored on 2016/07/07 02:44:55
Showing 2 changed files
lib/tempest
History View file @ aecfdf5
... ... 
@@ -430,12 +430,9 @@ function configure_tempest {
430 430 
     fi
431 431
432 432 
     # Scenario
433 
-    SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
433 
+    SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}
434 434 
     iniset $TEMPEST_CONFIG scenario img_dir $SCENARIO_IMAGE_DIR
435 
-    iniset $TEMPEST_CONFIG scenario ami_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img"
436 
-    iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd"
437 
-    iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz"
438 
-    iniset $TEMPEST_CONFIG scenario img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img"
435 
+    iniset $TEMPEST_CONFIG scenario img_file $DEFAULT_IMAGE_NAME
439 436
440 437 
     # Large Ops Number
441 438 
     iniset $TEMPEST_CONFIG scenario large_ops_number ${TEMPEST_LARGE_OPS_NUMBER:-0}
stackrc
History View file @ aecfdf5
... ... 
@@ -614,9 +614,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
614 614 
                 lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc
615 615 
                     DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs}
616 616 
                     IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs.img.gz";;
617 
-                *) # otherwise, use the uec style image (with kernel, ramdisk, disk)
618 
-                    DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
619 
-                    IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec.tar.gz";;
617 
+                *) # otherwise, use the qcow image
618 
+                    DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}
619 
+                    IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";;
620 620 
                 esac
621 621 
             ;;
622 622 
         vsphere)
... ... 
@@ -635,9 +635,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
635 635 
             fi
636 636 
             IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"
637 637 
             IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img";;
638 
-        *) # Default to Cirros with kernel, ramdisk and disk image
639 
-            DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
640 
-            IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec.tar.gz";;
638 
+        *) # Default to Cirros qcow2 image file
639 
+            DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}
640 
+            IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";;
641 641 
     esac
642 642 
     DOWNLOAD_DEFAULT_IMAGES=False
643 643 
 fi