diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-07 15:02:13 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-07 15:27:59 -0800 |
| commit | b0f1f1feb59bbca3196d9bba52cd32f46aa84b87 (patch) | |
| tree | 8d86ce1a07b5a5d3da8646c90657b76b3e456d34 | |
| parent | 70f0ea588e9b0ddf47c15531b86e81aa59556199 (diff) | |
| download | nova-b0f1f1feb59bbca3196d9bba52cd32f46aa84b87.tar.gz nova-b0f1f1feb59bbca3196d9bba52cd32f46aa84b87.tar.xz nova-b0f1f1feb59bbca3196d9bba52cd32f46aa84b87.zip | |
allow block migration to talk to glance/keystone
* removes unnecessary get_admin_context()
* addresses bug 949438
Change-Id: Iec9352f4c07179a39c796d235f0787ade30d5747
| -rw-r--r-- | nova/virt/libvirt/connection.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index b292c932d..889488c17 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -2018,13 +2018,13 @@ class LibvirtConnection(driver.ComputeDriver): # if image has kernel and ramdisk, just download # following normal way. if instance_ref['kernel_id']: - libvirt_utils.fetch_image(nova_context.get_admin_context(), + libvirt_utils.fetch_image(ctxt, os.path.join(instance_dir, 'kernel'), instance_ref['kernel_id'], instance_ref['user_id'], instance_ref['project_id']) if instance_ref['ramdisk_id']: - libvirt_utils.fetch_image(nova_context.get_admin_context(), + libvirt_utils.fetch_image(ctxt, os.path.join(instance_dir, 'ramdisk'), instance_ref['ramdisk_id'], instance_ref['user_id'], |