diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-22 09:54:56 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-22 09:54:56 +0000 |
| commit | 24568d8f9a78a57d483e23e1ff8a9c26472ce44b (patch) | |
| tree | a5ef9e3ca7e7f1af95393b57e9aa0550aa138e46 /plugins | |
| parent | b390c93917d060ebd6072ad58337c31c5e57da57 (diff) | |
| parent | e40d692c55a02fa686e83bd87eca29a3cfa3d15e (diff) | |
Merge trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index f37dd2f0f..b12175845 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -216,8 +216,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port, os_type): 'x-image-meta-status': 'queued', 'x-image-meta-disk-format': 'vhd', 'x-image-meta-container-format': 'ovf', - 'x-image-meta-property-os-type': os_type, - } + 'x-image-meta-property-os-type': os_type} for header, value in headers.iteritems(): conn.putheader(header, value) |