From: Alfredo Deza Date: Thu, 23 Aug 2018 14:56:09 +0000 (-0400) Subject: ceph-volume lvm.batch.filestore use new Device objects X-Git-Tag: v12.2.8~5^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d244f834eb8e7e5eeed80e14f36fc7bc5b2e8afe;p=ceph.git ceph-volume lvm.batch.filestore use new Device objects Signed-off-by: Alfredo Deza (cherry picked from commit 369bb740a0c52b075a81fb26b368ddf936319e24) --- diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py index 8b99a52942ec..9e80c5cbb906 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py @@ -67,17 +67,17 @@ class SingleType(object): osds = self.computed['osds'] vgs = self.computed['vgs'] for device in devices: - device_size = disk.Size(b=device['size']) + device_size = disk.Size(b=device.sys_api['size']) journal_size = prepare.get_journal_size(lv_format=False) data_size = device_size - journal_size data_percentage = data_size * 100 / device_size - vgs.append({'devices': [device['path']], 'parts': 2}) + vgs.append({'devices': [device.abspath], 'parts': 2}) osd = {'data': {}, 'journal': {}} - osd['data']['path'] = device['path'] + osd['data']['path'] = device.abspath osd['data']['size'] = data_size.b osd['data']['percentage'] = int(data_percentage) osd['data']['human_readable_size'] = str(data_size) - osd['journal']['path'] = device['path'] + osd['journal']['path'] = device.abspath osd['journal']['size'] = journal_size.b osd['journal']['percentage'] = int(100 - data_percentage) osd['journal']['human_readable_size'] = str(journal_size)