merge with zones2 fixes and trunk

1 files changed, 11 insertions, 3 deletions

diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index aa12d432a..201b99fda 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -201,13 +201,21 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port):
     # to request
     conn.putrequest('PUT', '/images/%s' % image_id)
 
-    # TODO(sirp): make `store` configurable
+    # NOTE(sirp): There is some confusion around OVF. Here's a summary of
+    # where we currently stand:
+    #   1. OVF as a container format is misnamed. We really should be using
+    #      OVA since that is the name for the container format; OVF is the
+    #      standard applied to the manifest file contained within.
+    #   2. We're currently uploading a vanilla tarball. In order to be OVF/OVA
+    #      compliant, we'll need to embed a minimal OVF manifest as the first
+    #      file.
     headers = {
         'content-type': 'application/octet-stream',
         'transfer-encoding': 'chunked',
-        'x-image-meta-is_public': 'True',
+        'x-image-meta-is-public': 'True',
         'x-image-meta-status': 'queued',
-        'x-image-meta-type': 'vhd'}
+        'x-image-meta-disk-format': 'vhd',
+        'x-image-meta-container-format': 'ovf'}
     for header, value in headers.iteritems():
         conn.putheader(header, value)
     conn.endheaders()