diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-21 15:23:11 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-03-21 15:23:11 -0400 |
| commit | 59cb754cc37635f79fc26d4596699705143f4544 (patch) | |
| tree | b467dc8eb5e4e202413266c77f284637f5c699d5 /plugins | |
| parent | 85f50cf496e2c193ddc715f3019b4a4769ab5bd9 (diff) | |
| parent | 246b146a46474266d7568b5df5cef8864cdaaa6b (diff) | |
| download | nova-59cb754cc37635f79fc26d4596699705143f4544.tar.gz nova-59cb754cc37635f79fc26d4596699705143f4544.tar.xz nova-59cb754cc37635f79fc26d4596699705143f4544.zip | |
merging trunk
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) |