diff options
| author | Matthew Sherborne <msherborne@gmail.com> | 2012-08-22 08:09:46 +1000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2013-01-15 18:29:49 +0000 |
| commit | 4b9bd9112ffc335f33d77f75fc8e5b21fe18f594 (patch) | |
| tree | c830abe031464ea24dcd0be7a199f0994a94096a /nova/api | |
| parent | 34ffd41831ee6b6e629a5f5c2e52c2729f00029d (diff) | |
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
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/admin_actions.py | 4 |
1 files changed, 1 insertions, 3 deletions
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: |