diff options
| author | matt.dietz@rackspace.com <> | 2011-03-22 17:02:33 +0000 |
|---|---|---|
| committer | matt.dietz@rackspace.com <> | 2011-03-22 17:02:33 +0000 |
| commit | f8061657030aaeeac50de1a5e01e147cd2fe7a58 (patch) | |
| tree | a802d7e99dc342745c6dd71bb407b73a440dbe57 /plugins | |
| parent | 9351bd5538ea0fc0a77c4dee13406ac7a71ca1ae (diff) | |
| parent | e40d692c55a02fa686e83bd87eca29a3cfa3d15e (diff) | |
| download | nova-f8061657030aaeeac50de1a5e01e147cd2fe7a58.tar.gz nova-f8061657030aaeeac50de1a5e01e147cd2fe7a58.tar.xz nova-f8061657030aaeeac50de1a5e01e147cd2fe7a58.zip | |
Resolved 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 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) |