Skip to content

Commit 916a22e

Browse files
committed
ceph-volume: Revert "ceph-volume: fix raw list for lvm devices"
This reverts commit e5e4296. This commit introduced a regression, see linked tracker for details. Fixes: https://tracker.ceph.com/issues/63391 Signed-off-by: Guillaume Abrioux <[email protected]>
1 parent a926342 commit 916a22e

File tree

1 file changed

+1
-4
lines changed
  • src/ceph-volume/ceph_volume/devices/raw

1 file changed

+1
-4
lines changed

src/ceph-volume/ceph_volume/devices/raw/list.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def __init__(self, argv):
6969
def generate(self, devs=None):
7070
logger.debug('Listing block devices via lsblk...')
7171
info_devices = disk.lsblk_all(abspath=True)
72-
if devs is None or devs == []:
72+
if not devs or not any(devs):
7373
# If no devs are given initially, we want to list ALL devices including children and
7474
# parents. Parent disks with child partitions may be the appropriate device to return if
7575
# the parent disk has a bluestore header, but children may be the most appropriate
@@ -89,9 +89,6 @@ def generate(self, devs=None):
8989
# determine whether a parent is bluestore, we should err on the side of not reporting
9090
# the child so as not to give a false negative.
9191
info_device = [info for info in info_devices if info['NAME'] == dev][0]
92-
if info_device['TYPE'] == 'lvm':
93-
# lvm devices are not raw devices
94-
continue
9592
if 'PKNAME' in info_device and info_device['PKNAME'] != "":
9693
parent = info_device['PKNAME']
9794
try:

0 commit comments

Comments
 (0)