summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-03-02 15:46:50 -0600
committerCerberus <matt.dietz@rackspace.com>2011-03-02 15:46:50 -0600
commit953fe68ce9b27322003200c464c121464761d1e2 (patch)
tree33fb4f3845f5eb849eaeb784c5c64673eda10e3c /plugins
parent8707a7a28c75e789f327b20f4cec779a6e8712d2 (diff)
downloadnova-953fe68ce9b27322003200c464c121464761d1e2.tar.gz
nova-953fe68ce9b27322003200c464c121464761d1e2.tar.xz
nova-953fe68ce9b27322003200c464c121464761d1e2.zip
merge fixes
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/glance2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index d08754c19..aa12d432a 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -207,7 +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()