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)
(cherry picked from commit aecfdf55627e7e651228b240eaec179d10b81241)
Matthew Treinish authored on 2016/07/07 02:44:55Showing 2 changed files
| ... | ... |
@@ -462,12 +462,9 @@ function configure_tempest {
|
| 462 | 462 |
fi |
| 463 | 463 |
|
| 464 | 464 |
# Scenario |
| 465 |
- SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
|
|
| 465 |
+ SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}
|
|
| 466 | 466 |
iniset $TEMPEST_CONFIG scenario img_dir $SCENARIO_IMAGE_DIR |
| 467 |
- iniset $TEMPEST_CONFIG scenario ami_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img"
|
|
| 468 |
- iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd"
|
|
| 469 |
- iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz"
|
|
| 470 |
- iniset $TEMPEST_CONFIG scenario img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img"
|
|
| 467 |
+ iniset $TEMPEST_CONFIG scenario img_file $DEFAULT_IMAGE_NAME |
|
| 471 | 468 |
|
| 472 | 469 |
# Large Ops Number |
| 473 | 470 |
iniset $TEMPEST_CONFIG scenario large_ops_number ${TEMPEST_LARGE_OPS_NUMBER:-0}
|
| ... | ... |
@@ -575,9 +575,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then |
| 575 | 575 |
lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc |
| 576 | 576 |
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs}
|
| 577 | 577 |
IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs.img.gz";;
|
| 578 |
- *) # otherwise, use the uec style image (with kernel, ramdisk, disk) |
|
| 579 |
- DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
|
|
| 580 |
- IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec.tar.gz";;
|
|
| 578 |
+ *) # otherwise, use the qcow image |
|
| 579 |
+ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}
|
|
| 580 |
+ IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";;
|
|
| 581 | 581 |
esac |
| 582 | 582 |
;; |
| 583 | 583 |
vsphere) |
| ... | ... |
@@ -596,9 +596,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then |
| 596 | 596 |
fi |
| 597 | 597 |
IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"
|
| 598 | 598 |
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img";;
|
| 599 |
- *) # Default to Cirros with kernel, ramdisk and disk image |
|
| 600 |
- DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
|
|
| 601 |
- IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec.tar.gz";;
|
|
| 599 |
+ *) # Default to Cirros qcow2 image file |
|
| 600 |
+ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img}
|
|
| 601 |
+ IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img";;
|
|
| 602 | 602 |
esac |
| 603 | 603 |
DOWNLOAD_DEFAULT_IMAGES=False |
| 604 | 604 |
fi |