1. devstack
  2. Commit 6fc332d85279865c32f50b081efb25ba7b671a9a
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)

Change-Id: Id65ebae73b28da7185cb349b714b659af51ef77f

Matthew Treinish authored on 2016/07/07 02:44:55
Showing 2 changed files
lib/tempest
History View file @ 6fc332d
... ... 
@@ -415,14 +415,11 @@ function configure_tempest {
415 415 
         iniset $TEMPEST_CONFIG scenario img_disk_format vhd
416 416 
         iniset $TEMPEST_CONFIG scenario img_container_format ovf
417 417 
     else
418 
-        SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
419 
-        SCENARIO_IMAGE_FILE="cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img"
418 
+        SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}
419 
+        SCENARIO_IMAGE_FILE=$DEFAULT_IMAGE_NAME
420 420 
     fi
421 421 
     iniset $TEMPEST_CONFIG scenario img_dir $SCENARIO_IMAGE_DIR
422 422 
     iniset $TEMPEST_CONFIG scenario img_file $SCENARIO_IMAGE_FILE
423 
-    iniset $TEMPEST_CONFIG scenario ami_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img"
424 
-    iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd"
425 
-    iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz"
426 423
427 424 
     # If using provider networking, use the physical network for validation rather than private
428 425 
     TEMPEST_SSH_NETWORK_NAME=$PRIVATE_NETWORK_NAME
stackrc
History View file @ 6fc332d
... ... 
@@ -634,9 +634,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
634 634 
                 lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc
635 635 
                     DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs}
636 636 
                     IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs.img.gz";;
637 
-                *) # otherwise, use the uec style image (with kernel, ramdisk, disk)
638 
-                    DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
639 
-                    IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec.tar.gz";;
637 
+                *) # otherwise, use the qcow image
638 
+                    DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}
639 
+                    IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";;
640 640 
                 esac
641 641 
             ;;
642 642 
         vsphere)
... ... 
@@ -650,9 +650,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
650 650 
             # NOTE(lucasagomes): The logic setting the default image
651 651 
             # now lives in the Ironic tree
652 652 
             ;;
653 
-        *) # Default to Cirros with kernel, ramdisk and disk image
654 
-            DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
655 
-            IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec.tar.gz";;
653 
+        *) # Default to Cirros qcow2 image file
654 
+            DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}
655 
+            IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";;
656 656 
     esac
657 657 
     DOWNLOAD_DEFAULT_IMAGES=False
658 658 
 fi