From 4b9bd9112ffc335f33d77f75fc8e5b21fe18f594 Mon Sep 17 00:00:00 2001 From: Matthew Sherborne Date: Wed, 22 Aug 2012 08:09:46 +1000 Subject: Cells: Add some cells support to admin_actions extension Add clearing of instance state in a way that works with cells. Implements blueprint nova-compute-cells Change-Id: I1cc1560bceb842c3bc82c6e9510eaef8a4931293 --- nova/api/openstack/compute/contrib/admin_actions.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py index f345d9617..fa7836b37 100644 --- a/nova/api/openstack/compute/contrib/admin_actions.py +++ b/nova/api/openstack/compute/contrib/admin_actions.py @@ -307,9 +307,7 @@ class AdminActionsController(wsgi.Controller): try: instance = self.compute_api.get(context, id) - self.compute_api.update(context, instance, - vm_state=state, - task_state=None) + self.compute_api.update_state(context, instance, state) except exception.InstanceNotFound: raise exc.HTTPNotFound(_("Server not found")) except Exception: -- cgit