summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-02-25 02:51:14 +0000
committerRick Harris <rick.harris@rackspace.com>2011-02-25 02:51:14 +0000
commite3d6dc70a6b77d80afcf87473bc79549540ac4ce (patch)
tree74ab6350de46b15f7b39a54d7f0718f4e0d9c71a /plugins
parentec9ede003c839248ca9593c03160a23ff8ec0db1 (diff)
downloadnova-e3d6dc70a6b77d80afcf87473bc79549540ac4ce.tar.gz
nova-e3d6dc70a6b77d80afcf87473bc79549540ac4ce.tar.xz
nova-e3d6dc70a6b77d80afcf87473bc79549540ac4ce.zip
Removing unecessary nokernel stuff
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/xenapi/etc/xapi.d/plugins/glance4
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index 869d46e70..18e4866f7 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -200,8 +200,6 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port):
# to request
conn.putrequest('PUT', '/images/%s' % image_id)
- # FIXME(sirp): nokernel signals Nova to use a raw image. This is defined by
- # FLAGS.null_kernel. Is there a way to get rid of this?
# TODO(sirp): make `store` configurable
headers = {
'content-type': 'application/octet-stream',
@@ -210,8 +208,6 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port):
'x-image-meta-status': 'queued',
'x-image-meta-store': 'file',
'x-image-meta-type': 'vhd',
- 'x-image-meta-property-kernel-id': 'nokernel',
- 'x-image-meta-property-ramdisk-id': 'noramdisk',
'x-image-meta-property-container-format': 'tarball',
}
for header, value in headers.iteritems():