diff options
| author | Ken Pepple <ken.pepple@gmail.com> | 2011-03-03 02:04:51 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-03-03 02:04:51 +0000 |
| commit | 20ae9eb5c368a7bf71013a551bbcfd9c1821e2b3 (patch) | |
| tree | 07e3d04cd26d8e8d27b8ddf3f241c68c50465fff /plugins | |
| parent | 11dde805f48a17465c9c2b0c08b8302713f25471 (diff) | |
| parent | dc8e308819fb383b317ff866288965a27016557e (diff) | |
| download | nova-20ae9eb5c368a7bf71013a551bbcfd9c1821e2b3.tar.gz nova-20ae9eb5c368a7bf71013a551bbcfd9c1821e2b3.tar.xz nova-20ae9eb5c368a7bf71013a551bbcfd9c1821e2b3.zip | |
merges dynamic instance types blueprint (http://wiki.openstack.org/ConfigureInstanceTypesDynamically) and bundles blueprint (https://blueprints.launchpad.net/nova/+spec/flavors)
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 7531af4ec..aa12d432a 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -207,8 +207,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port): 'transfer-encoding': 'chunked', 'x-image-meta-is_public': 'True', 'x-image-meta-status': 'queued', - 'x-image-meta-type': 'vhd' - } + 'x-image-meta-type': 'vhd'} for header, value in headers.iteritems(): conn.putheader(header, value) conn.endheaders() |