From 13599a50ae4420cc3fe132be9e1d0adf70aaf233 Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@managedit.ie>
Date: Fri, 20 Jan 2012 21:08:11 +0000
Subject: [PATCH] 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
---
 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 55cb31d..3cb68a3 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1779,20 +1779,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'])
             self._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']:
                 self._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,