diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-29 17:06:58 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-29 17:06:58 -0500 |
| commit | 7623b91391e9c03beb81f30563e40e71bb94313b (patch) | |
| tree | 76e0f0a4b61b9f8af9b1c36f4b54a3363ea95748 | |
| parent | 51f64e0073229f3bfe7ac3594170a372b51c1fd8 (diff) | |
changes a few instance refs
| -rw-r--r-- | nova/compute/manager.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 2f580939e..67fe1921f 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -318,7 +318,7 @@ class ComputeManager(manager.SchedulerDependentManager): self._update_launched_at(context, instance_id) self._update_state(context, instance_id) - usage_info = utils.usage_from_instance(instance_ref) + usage_info = utils.usage_from_instance(instance) notifier_api.notify('compute.%s' % self.host, 'compute.instance.create', notifier_api.INFO, @@ -372,11 +372,11 @@ 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) + instance = 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) - usage_info = utils.usage_from_instance(instance_ref) + usage_info = utils.usage_from_instance(instance) notifier_api.notify('compute.%s' % self.host, 'compute.instance.delete', notifier_api.INFO, |