diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-15 21:05:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-15 21:05:32 +0000 |
| commit | e98ec572f0989491ddfcb6de68a3e5bc7d4e0d73 (patch) | |
| tree | bb10012517704ec6f6297f18547395b8f3ed14b5 /nova/api | |
| parent | 73d32fedbd4dddc1bec9e036c2c546425bffc92c (diff) | |
| parent | 4b9bd9112ffc335f33d77f75fc8e5b21fe18f594 (diff) | |
| download | nova-e98ec572f0989491ddfcb6de68a3e5bc7d4e0d73.tar.gz nova-e98ec572f0989491ddfcb6de68a3e5bc7d4e0d73.tar.xz nova-e98ec572f0989491ddfcb6de68a3e5bc7d4e0d73.zip | |
Merge "Cells: Add some cells support to admin_actions extension"
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: |