summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-03-22 21:54:43 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-03-22 21:54:43 -0700
commit974b6502bb9e933955f6ea9acb6e6c47ce8d8588 (patch)
tree020185c9bd208564b8077cb2ff24ab41b05807b5 /plugins
parent209da18033a49062bbcfaf7739db5959be87b142 (diff)
parent83e2424e1c2721dd0ba42ca279de80b6c881ec21 (diff)
downloadnova-974b6502bb9e933955f6ea9acb6e6c47ce8d8588.tar.gz
nova-974b6502bb9e933955f6ea9acb6e6c47ce8d8588.tar.xz
nova-974b6502bb9e933955f6ea9acb6e6c47ce8d8588.zip
trunk merge
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 db39cb0f4..0a45f3873 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)