diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-03-17 15:57:04 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-03-17 15:57:04 -0500 |
| commit | 400ca259f49a741cf2cefd86afcf2494ee0bd446 (patch) | |
| tree | 881a11a7ba5a306f0d728c085a8021cb7e527bd5 /plugins | |
| parent | 038d99d9fa4354bd617adfa332d69a87a9f7918e (diff) | |
| parent | 88ae79505a84736ebdf57ba67c60ff16de5c9e87 (diff) | |
| download | nova-400ca259f49a741cf2cefd86afcf2494ee0bd446.tar.gz nova-400ca259f49a741cf2cefd86afcf2494ee0bd446.tar.xz nova-400ca259f49a741cf2cefd86afcf2494ee0bd446.zip | |
merged trunk, merged qos, slight refactor regarding merges
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(): |