diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-08 18:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-08 18:39:53 +0000 |
| commit | 814f0e5cc3287bf8a182dfb7cd52db81483fa93e (patch) | |
| tree | f736054a69cf94ac8131dfbb2bb52301c67fb3f1 /nova | |
| parent | af6f0d8cb31515307503cb85c688a0ec5462c781 (diff) | |
| parent | b0f1f1feb59bbca3196d9bba52cd32f46aa84b87 (diff) | |
| download | nova-814f0e5cc3287bf8a182dfb7cd52db81483fa93e.tar.gz nova-814f0e5cc3287bf8a182dfb7cd52db81483fa93e.tar.xz nova-814f0e5cc3287bf8a182dfb7cd52db81483fa93e.zip | |
Merge "allow block migration to talk to glance/keystone"
Diffstat (limited to 'nova')
| -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 6717b0afe..ae2a2b665 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -2008,13 +2008,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'], |