From 9f1b8228c93571552de4df73d1827dcd21498256 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 3 Jan 2013 14:34:48 -0800 Subject: Move instance_destroy() to conductor This patch moves compute/manager's use of db.instance_destroy() to the conductor. Related to blueprint no-db-compute-manager Change-Id: I72ee249ee2842a453fdf225414a03527448d2a26 --- nova/compute/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 67f2c61e2..cf35b24ff 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1054,7 +1054,7 @@ class ComputeManager(manager.SchedulerDependentManager): terminated_at=timeutils.utcnow()) system_meta = compute_utils.metadata_to_dict( instance['system_metadata']) - self.db.instance_destroy(context, instance_uuid) + self.conductor_api.instance_destroy(context, instance) # ensure block device mappings are not leaked self.conductor_api.block_device_mapping_destroy(context, bdms) -- cgit