openstack
/
nova
Code Issues Proposed changes

Fixes bug #919390 - Block Migration fails when keystone is un use. 

I've Updated the calls to nova.virt.libvirt.utils.fetch_image() to match the rest of the class.

Additionally, nova.virt.images.fetch() currently makes no use of the user/project id supplied.

Change-Id: I2db4b8c1b6542909fcc2b452fc961e22fe2557bf
This commit is contained in:
Kiall Mac Innes 2012-01-20 20:55:44 +00:00
parent fd1aa4613b
commit ccc2471f3e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@ -92,6 +92,7 @@ masukotm<masukotm@nttdata.co.jp>
Ken Pepple <ken.pepple@gmail.com>
Kevin Bringard <kbringard@attinteractive.com>
Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Kiall Mac Innes <kiall@managedit.ie>
Kirill Shileev <kshileev@gmail.com>
Koji Iida <iida.koji@lab.ntt.co.jp>
Likitha Shetty <likitha.shetty@citrix.com>

11
nova/virt/libvirt/connection.py
View File

@ -1797,20 +1797,17 @@ class LibvirtConnection(driver.ComputeDriver):
# if image has kernel and ramdisk, just download
# following normal way.
if instance_ref['kernel_id']:
user = manager.AuthManager().get_user(instance_ref['user_id'])
project = manager.AuthManager().get_project(
instance_ref['project_id'])
libvirt_utils.fetch_image(nova_context.get_admin_context(),
os.path.join(instance_dir, 'kernel'),
instance_ref['kernel_id'],
user,
project)
instance_ref['user_id'],
instance_ref['project_id'])
if instance_ref['ramdisk_id']:
libvirt_utils.fetch_image(nova_context.get_admin_context(),
os.path.join(instance_dir, 'ramdisk'),
instance_ref['ramdisk_id'],
user,
project)
instance_ref['user_id'],
instance_ref['project_id'])
def post_live_migration_at_destination(self, ctxt,
instance_ref,