summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2011-03-17 15:30:35 -0500
committerCerberus <matt.dietz@rackspace.com>2011-03-17 15:30:35 -0500
commita8c2af6cdab25c3010b9bb9587fc5072da14d68d (patch)
treee5dbd6dccdacac25b666f54a98beae60f4570987 /plugins
parent25c407b6ade499dd0bdd470e7fd46682c34a98b7 (diff)
parent88ae79505a84736ebdf57ba67c60ff16de5c9e87 (diff)
downloadnova-a8c2af6cdab25c3010b9bb9587fc5072da14d68d.tar.gz
nova-a8c2af6cdab25c3010b9bb9587fc5072da14d68d.tar.xz
nova-a8c2af6cdab25c3010b9bb9587fc5072da14d68d.zip
merge
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 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():