diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-06-28 15:59:44 +0000 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-06-28 15:59:44 +0000 |
| commit | c69fc237f3628d579a35af1f7bf3fbb4adeb81b7 (patch) | |
| tree | aacfd8f5343b53b02f00cdd6926db03d52a6b371 | |
| parent | 66b2fef4b294c7a351cc5815632da520c6ee811b (diff) | |
| download | nova-c69fc237f3628d579a35af1f7bf3fbb4adeb81b7.tar.gz nova-c69fc237f3628d579a35af1f7bf3fbb4adeb81b7.tar.xz nova-c69fc237f3628d579a35af1f7bf3fbb4adeb81b7.zip | |
Fix thinko in previous fix :P
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index ea5734ebd..0a0ebd768 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -438,11 +438,10 @@ class ComputeManager(manager.SchedulerDependentManager): def terminate_instance(self, context, instance_id): """Terminate an instance on this host.""" self._shutdown_instance(context, instance_id, 'Terminating') + instance_ref = self.db.instance_get(context.elevated(), instance_id) # 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'], |