diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-03-21 13:46:08 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-03-21 13:46:08 -0400 |
| commit | 9538957691c6c68955cbfcc7bd728110b85470af (patch) | |
| tree | 3b631a901da23ee5ff730fed68bd0f51acc10459 /plugins | |
| parent | 41c097000c1eeb4f1532b22f136c383b8174e6cc (diff) | |
| parent | cf84d5bc465823f9342a0a300176a3cf96fbb925 (diff) | |
Merge w/ trunk.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 2 |
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 c996f6ef4..db39cb0f4 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -216,7 +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(): |