diff --git a/nova/privsep/fs.py b/nova/privsep/fs.py index 638fd50ad48f..9bd7a326d038 100644 --- a/nova/privsep/fs.py +++ b/nova/privsep/fs.py @@ -75,11 +75,6 @@ def lvinfo(path): '--separator', '|', path) -@nova.privsep.sys_admin_pctxt.entrypoint -def lvremove(path): - processutils.execute('lvremove', '-f', path, attempts=3) - - @nova.privsep.sys_admin_pctxt.entrypoint def blockdev_size(path): return processutils.execute('blockdev', '--getsize64', path) diff --git a/nova/tests/unit/virt/libvirt/storage/test_lvm.py b/nova/tests/unit/virt/libvirt/storage/test_lvm.py index fbec2dcae909..b58a16b1f99d 100644 --- a/nova/tests/unit/virt/libvirt/storage/test_lvm.py +++ b/nova/tests/unit/virt/libvirt/storage/test_lvm.py @@ -118,7 +118,7 @@ class LvmTestCase(test.NoDBTestCase): lvm.clear_volume('/dev/foo') @mock.patch.object(lvm, 'clear_volume') - @mock.patch('nova.privsep.fs.lvremove', + @mock.patch('os_brick.local_dev.lvm.LVM.delete', side_effect=processutils.ProcessExecutionError('Error')) def test_fail_remove_all_logical_volumes(self, mock_clear, mock_lvremove): self.assertRaises(exception.VolumesNotRemoved, diff --git a/nova/virt/libvirt/storage/lvm.py b/nova/virt/libvirt/storage/lvm.py index 5f032b5cea75..c6eff1108f3f 100644 --- a/nova/virt/libvirt/storage/lvm.py +++ b/nova/virt/libvirt/storage/lvm.py @@ -21,6 +21,7 @@ import os +from os_brick.local_dev import lvm as brick_lvm from oslo_concurrency import processutils from oslo_log import log as logging from oslo_utils import units @@ -186,7 +187,7 @@ def remove_volumes(paths): for path in paths: clear_volume(path) try: - nova.privsep.fs.lvremove(path) + brick_lvm.LVM.delete(path) except processutils.ProcessExecutionError as exp: errors.append(six.text_type(exp)) if errors: