diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-15 15:28:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-15 15:28:38 +0000 |
| commit | d802d807049478d1fe30dedcbcdae28f666e61b3 (patch) | |
| tree | 9ea7902a832f9fd56b4939e7cdd9ee091fdee6c4 /nova/api | |
| parent | 63c1d5e6fadca26226f17cb7bcd6400553f6cfa7 (diff) | |
| parent | 5f46f6acf3a000c8e65ee6f2574aff518b036d29 (diff) | |
| download | nova-d802d807049478d1fe30dedcbcdae28f666e61b3.tar.gz nova-d802d807049478d1fe30dedcbcdae28f666e61b3.tar.xz nova-d802d807049478d1fe30dedcbcdae28f666e61b3.zip | |
Merge "Fixes instance task_state being left as migrating"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/admin_actions.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/admin_actions.py b/nova/api/openstack/compute/contrib/admin_actions.py index 8e5863706..951bc0c11 100644 --- a/nova/api/openstack/compute/contrib/admin_actions.py +++ b/nova/api/openstack/compute/contrib/admin_actions.py @@ -282,7 +282,10 @@ class AdminActionsController(wsgi.Controller): instance = self.compute_api.get(context, id) self.compute_api.live_migrate(context, instance, block_migration, disk_over_commit, host) - except exception.ComputeServiceUnavailable as ex: + except (exception.ComputeServiceUnavailable, + exception.InvalidHypervisorType, + exception.UnableToMigrateToSelf, + exception.DestinationHypervisorTooOld) as ex: raise exc.HTTPBadRequest(explanation=str(ex)) except Exception: if host is None: |