summaryrefslogtreecommitdiffstats
path: root/plugins/xenserver
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-20 20:04:51 +0100
committerSoren Hansen <soren@linux2go.dk>2011-03-20 20:04:51 +0100
commit049e895beaf862ee0af89a9c465220f1fc44b404 (patch)
tree9f9b2c2f74cfbf278b3fa6fbfe4a4dbe924943bd /plugins/xenserver
parent4b18488223d2c51958855456cb4f5877f331aaa1 (diff)
parent3e255ad1bc685c0d39631540e664bde49e0670db (diff)
Merge trunk
Diffstat (limited to 'plugins/xenserver')
-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 c996f6ef4..db39cb0f4 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -216,7 +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():