diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-22 10:11:42 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-22 10:11:42 -0400 |
| commit | 7bcf91f87666e21225b0eb42746e3f1417bab6fa (patch) | |
| tree | aaf0e0003051901dac4948157734df56f6037e01 /plugins | |
| parent | 0845d7081bc912e7eefa2d98e8c53033d872ef5e (diff) | |
| parent | e40d692c55a02fa686e83bd87eca29a3cfa3d15e (diff) | |
| download | nova-7bcf91f87666e21225b0eb42746e3f1417bab6fa.tar.gz nova-7bcf91f87666e21225b0eb42746e3f1417bab6fa.tar.xz nova-7bcf91f87666e21225b0eb42746e3f1417bab6fa.zip | |
merging trunk r843
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) |