Skip to content

Commit bd5e1a8

Browse files
committed
ceph-volume: allow removable devices but exclude USB
Changed the logic to exclude USB devices to pass hot swap devices that were passed through before the bug. Fixes: https://tracker.ceph.com/issues/57907 Fixes: https://tracker.ceph.com/issues/58189 Fixes: https://tracker.ceph.com/issues/58306 Fixes: https://tracker.ceph.com/issues/58591 Signed-off-by: Kim Minjong <[email protected]>
1 parent a78e660 commit bd5e1a8

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/ceph-volume/ceph_volume/util/device.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ def has_partitions(self):
594594

595595
def _check_generic_reject_reasons(self):
596596
reasons = [
597-
('removable', '1', 'removable'),
597+
('id_bus', 'usb', 'id_bus'),
598598
('ro', '1', 'read-only'),
599599
]
600600
rejected = [reason for (k, v, reason) in reasons if

src/ceph-volume/ceph_volume/util/disk.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,10 @@ def get_devices(_sys_block_path='/sys/block', device=''):
916916
metadata['path'] = diskname
917917
metadata['type'] = block[2]
918918

919+
# some facts from udevadm
920+
p = udevadm_property(sysdir)
921+
metadata['id_bus'] = p.get('ID_BUS', '')
922+
919923
device_facts[diskname] = metadata
920924
return device_facts
921925

0 commit comments

Comments
 (0)