summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-18 08:01:07 +0000
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-18 08:01:07 +0000
commitdde92454697b23a02abd573feeea13fec0bd8a9a (patch)
tree7d082acbb041b340e586cf5cd1bb65de6613cbd8 /plugins
parentd1958f61e5573b6a4101564e6e4b1969000eccca (diff)
parentabe147f756f13d4f968aa075d709e5c6643d310a (diff)
merge trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/glance3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index 0a45f3873..db39cb0f4 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -216,7 +216,8 @@ 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)