Remove default image logic for Ironic from DevStack
The logic to set the default image for Ironic has been moved into the Ironic tree. This patch is just removing it from DevStack. Change-Id: Iaeb177f194adc83e40d86696e5553f9f72bbd1f9 Depends-On: Id828b41dc44113ce1cd094ce5fc245989699d4ff
This commit is contained in:
parent
7ec59a017a
commit
0c6956862e
11
stackrc
11
stackrc
@ -647,14 +647,9 @@ if [[ "$DOWNLOAD_DEFAULT_IMAGES" == "True" ]]; then
|
||||
IMAGE_URLS+="http://ca.downloads.xensource.com/OpenStack/cirros-0.3.4-x86_64-disk.vhd.tgz"
|
||||
IMAGE_URLS+=",http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-x86_64-uec.tar.gz";;
|
||||
ironic)
|
||||
# Ironic can do both partition and full disk images, depending on the driver
|
||||
if [[ -z "${IRONIC_DEPLOY_DRIVER%%agent*}" ]]; then
|
||||
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-disk}
|
||||
else
|
||||
DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros-${CIRROS_VERSION}-x86_64-uec}
|
||||
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";;
|
||||
# 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";;
|
||||
|
Loading…
x
Reference in New Issue
Block a user