diff options
| author | Kiall Mac Innes <kiall@managedit.ie> | 2012-01-20 20:55:44 +0000 |
|---|---|---|
| committer | Kiall Mac Innes <kiall@managedit.ie> | 2012-01-20 21:11:47 +0000 |
| commit | ccc2471f3e8fd4f5fc0572b4f29c579022f984a7 (patch) | |
| tree | 49dc6eac8d880f84c98d53041d5cf6a966d21469 | |
| parent | fd1aa4613b9a644ad2d702ac2d15cf12cef589c5 (diff) | |
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
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | nova/virt/libvirt/connection.py | 11 |
2 files changed, 5 insertions, 7 deletions
@@ -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> diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index f96d7bfa2..ab4e50efd 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -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, |