Merge "Upload XenServer style ovf directly to glance"

This commit is contained in:
Jenkins 2013-02-22 12:30:37 +00:00 committed by Gerrit Code Review
commit 3bfc90df4c

View File

@ -923,6 +923,15 @@ function upload_image() {
return
fi
# XenServer-ovf-format images are provided as .vhd.tgz as well
# and should not be decompressed prior to loading
if [[ "$image_url" =~ '.vhd.tgz' ]]; then
IMAGE="$FILES/${IMAGE_FNAME}"
IMAGE_NAME="${IMAGE_FNAME%.vhd.tgz}"
glance --os-auth-token $token --os-image-url http://$GLANCE_HOSTPORT image-create --name "$IMAGE_NAME" --is-public=True --container-format=ovf --disk-format=vhd < "${IMAGE}"
return
fi
KERNEL=""
RAMDISK=""
DISK_FORMAT=""