diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-02 16:13:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-02 16:13:15 +0000 |
| commit | 8bb1cc2f82b0d1dcfb08777537584e5f574ae439 (patch) | |
| tree | 432f05723868e95a3db0e6cf02cd6d7ac42006b9 /nova/api | |
| parent | 6e3997322d306bda31e02b03bfbd8c73b3367b39 (diff) | |
| parent | 5ada427935a0664f6c2534163f9988fb85d7b6ca (diff) | |
| download | nova-8bb1cc2f82b0d1dcfb08777537584e5f574ae439.tar.gz nova-8bb1cc2f82b0d1dcfb08777537584e5f574ae439.tar.xz nova-8bb1cc2f82b0d1dcfb08777537584e5f574ae439.zip | |
Merge "Prevent rescuing a VM with a partially mounted volume."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/rescue.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/rescue.py b/nova/api/openstack/compute/contrib/rescue.py index 143b59063..c89d11117 100644 --- a/nova/api/openstack/compute/contrib/rescue.py +++ b/nova/api/openstack/compute/contrib/rescue.py @@ -60,6 +60,8 @@ class RescueController(wsgi.Controller): except exception.InstanceInvalidState as state_error: common.raise_http_conflict_for_instance_invalid_state(state_error, 'rescue') + except exception.InvalidVolume as volume_error: + raise exc.HTTPConflict(explanation=volume_error.format_message()) except exception.InstanceNotRescuable as non_rescuable: raise exc.HTTPBadRequest( explanation=non_rescuable.format_message()) |