Revert "Restore iscsi loopback LVM volume group on startup"
This reverts commitb8f15088b5
. The original commit failed to fully address the problem it tried to solve, and is causing additional problems. Closes-Bug: #1768833 Change-Id: I9126e5acaf16a39528c65e756eb475dc62e1ab40 Conflicts: manifests/setup_test_volume.pp (cherry picked from commit2761f8b1b9
)
This commit is contained in:
parent
4011a82f54
commit
24fd4bd776
|
@ -59,12 +59,4 @@ class cinder::setup_test_volume(
|
|||
unless => "vgdisplay | grep ${volume_name}",
|
||||
refreshonly => true,
|
||||
}
|
||||
|
||||
# Ensure the loopback device and volume group are restored if the system
|
||||
# were to reboot.
|
||||
-> exec { "losetup -f ${volume_path}/${volume_name} && udevadm settle && vgchange -a y ${volume_name}":
|
||||
path => ['/bin','/usr/bin','/sbin','/usr/sbin'],
|
||||
unless => "losetup -l | grep ${volume_path}/${volume_name}",
|
||||
before => Anchor['cinder::service::begin'],
|
||||
}
|
||||
}
|
||||
|
|
|
@ -20,8 +20,4 @@ describe 'cinder::setup_test_volume' do
|
|||
:mode => '0640'
|
||||
)
|
||||
end
|
||||
|
||||
it 'should restore loopback device and volume group' do
|
||||
is_expected.to contain_exec('losetup -f /var/lib/cinder/cinder-volumes && udevadm settle && vgchange -a y cinder-volumes')
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue