From 316ed6cc6e1d23b5d10c10f4708d2e5735f4c6d2 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date: Wed, 6 Feb 2013 15:29:49 -0500
Subject: [PATCH] Upload XenServer style ovf directly to glance

Don't decompress images ending with .vhd.tgz, just send them
to glance

Fixes LP# 1117256

Change-Id: I201debc2e34808703c717276d192169b1ed24c05
---
 functions | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/functions b/functions
index ae63436ace..22ba168e55 100644
--- a/functions
+++ b/functions
@@ -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=""