RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 23:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-volume: fix Batch object in py3 environments

Browse Source 
Fixes: https://tracker.ceph.com/issues/37356

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
This commit is contained in:
Jan Fajerski 2018-11-30 09:22:51 +01:00
parent 8fe92c3534
commit 851c7693da
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ceph-volume/ceph_volume/devices/lvm/batch.py
View File

@ -139,14 +139,11 @@ class Batch(object):
self.argv = argv
def get_devices(self):
all_devices = disk.get_devices()
# remove devices with partitions
# XXX Should be optional when getting device info
for device, detail in all_devices.items():
if detail.get('partitions') != {}:
del all_devices[device]
devices = sorted(all_devices.items(), key=lambda x: (x[0], x[1]['size']))
return device_formatter(devices)
devices = [(device, details) for device, details in
disk.get_devices().items() if details.get('partitions') == {}]
size_sort = lambda x: (x[0], x[1]['size'])
return device_formatter(sorted(devices, key=size_sort))
def print_help(self):
return self._help.format(