From e4d52f45c65704a3c153137a3d997aa3cccd8a79 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Tue, 12 Mar 2013 22:14:08 +0000 Subject: Fix cells instance deletion Instance delete and soft_delete are broken with cells when the API doesn't know the cell of an instance. A traceback occurs in all child cells. Also: soft_delete results in a 'hard' type being sent to child cells vs 'soft'. Fixes bug 1154333 Change-Id: I13ac839fa13a66caa100a3459bcc8e1183821ff1 --- nova/compute/cells_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/compute') diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py index d5a07490b..51b971aa0 100644 --- a/nova/compute/cells_api.py +++ b/nova/compute/cells_api.py @@ -255,9 +255,9 @@ class ComputeCellsAPI(compute_api.API): # broadcast a message down to all cells and hope this ends # up resolving itself... Worse case.. the instance will # show back up again here. - delete_type = method == 'soft_delete' and 'soft' or 'hard' + delete_type = method_name == 'soft_delete' and 'soft' or 'hard' self.cells_rpcapi.instance_delete_everywhere(context, - instance['uuid'], delete_type) + instance, delete_type) @validate_cell def restore(self, context, instance): -- cgit