diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-06-28 15:50:07 +0000 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-06-28 15:50:07 +0000 |
| commit | 66b2fef4b294c7a351cc5815632da520c6ee811b (patch) | |
| tree | 09fac87c4fa8b5cd9ac2fd613880d9b4a73e7454 | |
| parent | 4c1d05d27f207e71546f20c4e603839afc232b5a (diff) | |
Fix yet more merge-skew.
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 2c4f500f0..ea5734ebd 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -441,6 +441,8 @@ class ComputeManager(manager.SchedulerDependentManager): # TODO(ja): should we keep it in a terminated state for a bit? self.db.instance_destroy(context, instance_id) + context = context.elevated() + instance_ref = self.db.instance_get(context, instance_id) usage_info = dict( tenant_id=instance_ref['project_id'], user_id=instance_ref['user_id'], |