commit 3bfc90df4c9345283a451fc512596dce2cdf52c6
author Jenkins <jenkins@review.openstack.org> Fri Feb 22 12:30:37 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Feb 22 12:30:37 2013 +0000
tree abd5f798a9d4612ac63cfc6c5bf7a9463e27cf2a
parent d0b1c37816392efd2ce40786f7c2925cc80af569
parent 316ed6cc6e1d23b5d10c10f4708d2e5735f4c6d2

Merge "Upload XenServer style ovf directly to glance"

functions

diff --git a/functions b/functions
index d475e58..b94c611 100644
--- a/functions
+++ b/functions
@@ -923,6 +923,15 @@
         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=""