From f8c0033de22fee7a0d1809f6e4a3226ac8d3ce9d Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Fri, 2 Aug 2013 15:07:12 -0400
Subject: [PATCH] feat(image_to_vm): Add openstack image, uses oem-ami and
 qcow2 format.

---
 build_library/vm_image_util.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 174b5dd161..d5512d2063 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -7,6 +7,7 @@
 
 VALID_IMG_TYPES=(
     ami
+    openstack
     qemu
     rackspace
     vagrant
@@ -38,7 +39,7 @@ IMG_DEFAULT_HYBRID_MBR=0
 IMG_DEFAULT_OEM_PACKAGE=
 
 # Name of the target image format.
-# May be raw or vmdk (vmware, virtualbox)
+# May be raw, qcow2 (qemu), or vmdk (vmware, virtualbox)
 IMG_DEFAULT_DISK_FORMAT=raw
 
 # Name of the target config format, default is no config
@@ -73,6 +74,10 @@ IMG_vmware_CONF_FORMAT=vmx
 IMG_ami_HYBRID_MBR=1
 IMG_ami_OEM_PACKAGE=oem-ami
 
+## openstack, supports ec2's metadata format so use oem-ami
+IMG_openstack_DISK_FORMAT=qcow2
+IMG_openstack_OEM_PACKAGE=oem-ami
+
 ## rackspace
 # TODO: package doesn't exist yet
 #IMG_rackspace_OEM_PACKAGE=oem-rackspace