summaryrefslogtreecommitdiffstats
path: root/plugins/xenserver
diff options
context:
space:
mode:
authormatt.dietz@rackspace.com <>2011-03-04 16:53:50 +0000
committermatt.dietz@rackspace.com <>2011-03-04 16:53:50 +0000
commit26bf996e7edfa741f235284749fdbdd6c11653a7 (patch)
treecf2df7abbfb6ade4270cea763ad7a104911ac9ba /plugins/xenserver
parent63d799a5ac6172b73708a183f3d952a2c8b53c2b (diff)
parent2280848e8477c33f2a903eb7f821dcbcc90ce307 (diff)
Merge from trunk
Diffstat (limited to 'plugins/xenserver')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/glance3
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 7531af4ec..aa12d432a 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -207,8 +207,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port):
'transfer-encoding': 'chunked',
'x-image-meta-is_public': 'True',
'x-image-meta-status': 'queued',
- 'x-image-meta-type': 'vhd'
- }
+ 'x-image-meta-type': 'vhd'}
for header, value in headers.iteritems():
conn.putheader(header, value)
conn.endheaders()