diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-03 15:50:34 +0000 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-03 15:50:34 +0000 |
| commit | 9d2ee1b26196efe855d298639561ca69fb96e2cc (patch) | |
| tree | b8283238588ec106c680c074b9650b8b4d93496e /plugins | |
| parent | 6797c5acc47fb5111ef821d6b074cb635692a9fb (diff) | |
| parent | 90e8072df434621a364763f1c7cae0ac0159d630 (diff) | |
| download | nova-9d2ee1b26196efe855d298639561ca69fb96e2cc.tar.gz nova-9d2ee1b26196efe855d298639561ca69fb96e2cc.tar.xz nova-9d2ee1b26196efe855d298639561ca69fb96e2cc.zip | |
Remerged trunk, fixed a few conflicts.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 3 |
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 a45d32cb2..aa12d432a 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -207,8 +207,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port): 'transfer-encoding': 'chunked', 'x-image-meta-is_public': 'True', 'x-image-meta-status': 'queued', - 'x-image-meta-type': 'vhd', - } + 'x-image-meta-type': 'vhd'} for header, value in headers.iteritems(): conn.putheader(header, value) conn.endheaders() |