diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-22 20:42:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-22 20:42:23 +0000 |
| commit | c233b8eaafe01cdaabb02a181d73c85a7d37ce17 (patch) | |
| tree | 6b0cbe3c3a5b9747757826cd0d4cc23d589b6352 /nova | |
| parent | ec1b11fe619a1d0f44121fc127094108da592173 (diff) | |
| parent | ccc2471f3e8fd4f5fc0572b4f29c579022f984a7 (diff) | |
| download | nova-c233b8eaafe01cdaabb02a181d73c85a7d37ce17.tar.gz nova-c233b8eaafe01cdaabb02a181d73c85a7d37ce17.tar.xz nova-c233b8eaafe01cdaabb02a181d73c85a7d37ce17.zip | |
Merge "Fixes bug #919390 - Block Migration fails when keystone is un use."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/libvirt/connection.py | 11 |
1 files changed, 4 insertions, 7 deletions
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, |