summaryrefslogtreecommitdiffstats
path: root/plugins/xenserver
diff options
context:
space:
mode:
authorCory Wright <cory.wright@rackspace.com>2011-03-04 17:59:28 +0000
committerCory Wright <cory.wright@rackspace.com>2011-03-04 17:59:28 +0000
commit44a4d20d4be54dc07875bc4609950d07e2fc4398 (patch)
tree9bc22a61674bf91ef17f2ab9d7be8dbdffb9db67 /plugins/xenserver
parent68d894be2ec3b4eaa14dc5c90143f45f7db1e4b8 (diff)
parent2280848e8477c33f2a903eb7f821dcbcc90ce307 (diff)
downloadnova-44a4d20d4be54dc07875bc4609950d07e2fc4398.tar.gz
nova-44a4d20d4be54dc07875bc4609950d07e2fc4398.tar.xz
nova-44a4d20d4be54dc07875bc4609950d07e2fc4398.zip
merged 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 160bf482f..bca8212c3 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -209,7 +209,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port, os_type):
'x-image-meta-status': 'queued',
'x-image-meta-type': 'vhd',
'x-image-meta-property-os-type': os_type
- }
+ }
for header, value in headers.iteritems():
conn.putheader(header, value)
conn.endheaders()