diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2013-04-10 01:05:42 +0000 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2013-05-01 19:38:40 +0000 |
| commit | 5ada427935a0664f6c2534163f9988fb85d7b6ca (patch) | |
| tree | 93f450ecbf6f0734b2e5ad79f8b71ea3e60bc25a /nova/api | |
| parent | 423289d50d92cf4b780a11c2c3da4e1dbbd865f2 (diff) | |
Prevent rescuing a VM with a partially mounted volume.
If a VM goes into rescue mode with a partially mounted volume, the
volume won't re-appear after the VM is unrescued.
Fix bug 1158942
Change-Id: I1e104236c41c59e67a0f0e9ef26143c57f6e0094
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()) |