summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-22 16:06:28 +0000
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-03-22 16:06:28 +0000
commitc52501cf6dc6244ab9adadd23c579ac90cf49e5b (patch)
treef5882cd232ee5df4363bc12e0f25d9af65bcaadc /plugins
parentb53a75d4d6f860504abe33f635159bb71760cc3b (diff)
parente40d692c55a02fa686e83bd87eca29a3cfa3d15e (diff)
downloadnova-c52501cf6dc6244ab9adadd23c579ac90cf49e5b.tar.gz
nova-c52501cf6dc6244ab9adadd23c579ac90cf49e5b.tar.xz
nova-c52501cf6dc6244ab9adadd23c579ac90cf49e5b.zip
Addressed reviewer's comments
Adapted unit tests to updated code Merged with trunk
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)