]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "ceph-volume util.disk include partitions as top level devices in get_devices"
authorJan Fajerski <jfajerski@suse.com>
Tue, 4 Dec 2018 07:29:39 +0000 (08:29 +0100)
committerJan Fajerski <jfajerski@suse.com>
Wed, 6 Feb 2019 05:18:07 +0000 (06:18 +0100)
This reverts commit 7f3c3598491e556ec1b93ea0a54f52144202fab6.
Fixes: http://tracker.ceph.com/issues/37506
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 50bc44f1c2327ad38504950fe62820a44ead9b14)

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

index c85d3be9aaad3525b3f67cefe3dffa17c4ae028d..da6411329a1682806fb62c8aca79ae63264bb933 100644 (file)
@@ -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