From 66b2fef4b294c7a351cc5815632da520c6ee811b Mon Sep 17 00:00:00 2001
From: Monsyne Dragon <mdragon@rackspace.com>
Date: Tue, 28 Jun 2011 15:50:07 +0000
Subject: Fix yet more merge-skew.

---
 nova/compute/manager.py | 2 ++
 1 file changed, 2 insertions(+)

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'],
-- 
cgit