Revert "Switch devstack to use qcow cirros img"
This breaks grenade, we didn't catch it because we don't
run the forward path grenade to catch this and ocata doesn't have the backport.
This reverts commit 3366b21bff
.
Change-Id: I4ef61845d2265a0dd51da17520bed029d2eda338
This commit is contained in:
parent
3366b21bff
commit
082b6b386d
|
@ -413,10 +413,12 @@ function configure_tempest {
|
|||
fi
|
||||
|
||||
# Scenario
|
||||
SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES}
|
||||
SCENARIO_IMAGE_FILE=$DEFAULT_IMAGE_NAME
|
||||
SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec}
|
||||
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"
|
||||
iniset $TEMPEST_CONFIG scenario img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img"
|
||||
|
||||
# Telemetry
|
||||
iniset $TEMPEST_CONFIG telemetry-feature-enabled events "True"
|
||||
|
|
12
stackrc
12
stackrc
|
@ -644,9 +644,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 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";;
|
||||
*) # 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";;
|
||||
esac
|
||||
;;
|
||||
vsphere)
|
||||
|
@ -665,9 +665,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
|
|||
fi
|
||||
IMAGE_URLS+="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz"
|
||||
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-disk.img";;
|
||||
*) # 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";;
|
||||
*) # 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";;
|
||||
esac
|
||||
DOWNLOAD_DEFAULT_IMAGES=False
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue