summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-03-03 10:55:02 -0400
committerSandy Walsh <sandy.walsh@rackspace.com>2011-03-03 10:55:02 -0400
commitd3584eeeb289120eef17ae5dd448a6237e05935b (patch)
treeb5384649a8ada36dc83785b5832af67b8ec00c31 /plugins
parent459616ac2fdf243e65ecdc0f4b5750fa6d073edb (diff)
parent20ae9eb5c368a7bf71013a551bbcfd9c1821e2b3 (diff)
trunk merge, pip-requires and novatools to novaclient changes
Diffstat (limited to 'plugins')
-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()