diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-18 01:47:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-18 01:47:20 +0000 |
| commit | 83508c380893419114f2013a3dfd14c96ddec6a1 (patch) | |
| tree | 6af3432e675106b437873df7aa35ef1e327155fc | |
| parent | 948e4826bea0acbd2e3ef7baeaa40723539fc536 (diff) | |
| parent | c87a88f0a531effeff571c2aa014e629e8299564 (diff) | |
| download | nova-83508c380893419114f2013a3dfd14c96ddec6a1.tar.gz | |
Merge "Fix InstanceNotFound error in _delete_instance_files" into stable/havana
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index c78605526b..34f4f42b2c 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -4758,7 +4758,7 @@ class LibvirtDriver(driver.ComputeDriver): def _delete_instance_files(self, instance): # NOTE(mikal): a shim to handle this file not using instance objects # everywhere. Remove this when that conversion happens. - context = nova_context.get_admin_context() + context = nova_context.get_admin_context(read_deleted='yes') inst_obj = instance_obj.Instance.get_by_uuid(context, instance['uuid']) # NOTE(mikal): this code should be pushed up a layer when this shim is |