From fc8a4de347a1c3d315c6028ca230a6f570d74fa7 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Tue, 4 Dec 2018 08:29:39 +0100 Subject: [PATCH] Revert "ceph-volume util.disk include partitions as top level devices in get_devices" This reverts commit 7f3c3598491e556ec1b93ea0a54f52144202fab6. Fixes: http://tracker.ceph.com/issues/37506 Signed-off-by: Jan Fajerski (cherry picked from commit 50bc44f1c2327ad38504950fe62820a44ead9b14) --- src/ceph-volume/ceph_volume/util/disk.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ceph-volume/ceph_volume/util/disk.py b/src/ceph-volume/ceph_volume/util/disk.py index c85d3be9aaad3..da6411329a168 100644 --- a/src/ceph-volume/ceph_volume/util/disk.py +++ b/src/ceph-volume/ceph_volume/util/disk.py @@ -815,9 +815,5 @@ def get_devices(_sys_block_path='/sys/block', _dev_path='/dev', _mapper_path='/d metadata['path'] = diskname metadata['locked'] = is_locked_raw_device(metadata['path']) - for part_name, part_metadata in metadata['partitions'].items(): - part_abspath = '/dev/%s' % part_name - device_facts[part_abspath] = part_metadata - device_facts[diskname] = metadata return device_facts -- 2.39.5