Merging trunk, small fixes

openstack/nova

Code Issues Proposed changes

This commit is contained in:

Rick Harris

2011年02月25日 01:31:02 +00:00

parent 05d135be0c c8b630a78e

commit c8345c9ebc

122 changed files with 26329 additions and 3118 deletions

@@ -46,6 +46,10 @@ def _copy_kernel_vdi(dest, copy_args):

logging.debug("copying kernel/ramdisk file from %s to /boot/guest/%s",

dest, vdi_uuid)

filename = KERNEL_DIR + '/' + vdi_uuid

#make sure KERNEL_DIR exists, otherwise create it

if not os.path.isdir(KERNEL_DIR):

logging.debug("Creating directory %s", KERNEL_DIR)

os.makedirs(KERNEL_DIR)

#read data from /dev/ and write into a file on /boot/guest

of = open(filename, 'wb')

f = open(dest, 'rb')

@@ -212,6 +216,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port):

'x-image-meta-store': 'file',

'x-image-meta-is_public': 'True',

'x-image-meta-type': 'vhd',

'x-image-meta-status': 'queued',

'x-image-meta-property-kernel-id': 'nokernel',

'x-image-meta-property-ramdisk-id': 'noramdisk',

'x-image-meta-property-container-format': 'tarball',

@@ -237,7 +242,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port):

resp = conn.getresponse()

if resp.status != httplib.OK:

raise Exception("Unexpected response from Glance %i" % res.status)

raise Exception("Unexpected response from Glance %i" % resp.status)

conn.close()