diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-19 19:28:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-19 19:28:27 +0000 |
| commit | 80d453c9c66b144c681073366bdc45942d2b72e4 (patch) | |
| tree | d1ef79b7bdfed491f6934a7a0b059f293d16326e | |
| parent | 7bfe54480a03f657a355de09b8cd63ba9e61706b (diff) | |
| parent | c407a691674aff37b952e14d6a125e5e42d79f02 (diff) | |
| download | nova-80d453c9c66b144c681073366bdc45942d2b72e4.tar.gz | |
Merge "Clean up volumes on boot failure" into stable/ocata
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/tests/unit/compute/test_compute_mgr.py | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index a7ea7e23b7..93d7a351a4 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1796,6 +1796,8 @@ class ComputeManager(manager.Manager): instance=instance) self._cleanup_allocated_networks(context, instance, requested_networks) + self._cleanup_volumes(context, instance.uuid, + block_device_mapping, raise_exc=False) compute_utils.add_instance_fault_from_exc(context, instance, e, sys.exc_info(), fault_message=e.kwargs['reason']) diff --git a/nova/tests/unit/compute/test_compute_mgr.py b/nova/tests/unit/compute/test_compute_mgr.py index 945b53c831..ba69be6e68 100644 --- a/nova/tests/unit/compute/test_compute_mgr.py +++ b/nova/tests/unit/compute/test_compute_mgr.py @@ -3780,6 +3780,9 @@ class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase): self.block_device_mapping, self.node, self.limits, {}) mock_clean_net.assert_called_once_with(self.context, self.instance, self.requested_networks) + mock_clean_vol.assert_called_once_with(self.context, + self.instance.uuid, self.block_device_mapping, + raise_exc=False) mock_add.assert_called_once_with(self.context, self.instance, mock.ANY, mock.ANY, fault_message=mock.ANY) mock_nil.assert_called_once_with(self.instance) |