From: Alfredo Deza Date: Wed, 8 Aug 2018 19:37:42 +0000 (-0400) Subject: ceph-volume lvm.strategies update filestore use of Size objects X-Git-Tag: v14.0.1~520^2~3^2~16 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f29ec4c6077e9ab36a9eb5ac030b17cd3a47567c;p=ceph-ci.git ceph-volume lvm.strategies update filestore use of Size objects Signed-off-by: Alfredo Deza --- 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 914772f3b56..6651b4e94ec 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py @@ -27,10 +27,10 @@ class SingleType(object): def report_pretty(self): string = "" - string += templates.osd_header.format( + string += templates.total_osds.format( total_osds=len(self.hdds) or len(self.ssds) * 2 ) - string += templates.osd_component + string += templates.osd_component_titles for osd in self.computed['osds']: string += templates.osd_header @@ -76,11 +76,11 @@ class SingleType(object): osd = {'data': {}, 'journal': {}} osd['data']['path'] = device['path'] osd['data']['size'] = data_size.b - osd['data']['percentage'] = round(data_percentage.b) - osd['data']['human_readable_size'] = str(data_size / 100) + osd['data']['percentage'] = int(data_percentage) + osd['data']['human_readable_size'] = str(data_size) osd['journal']['path'] = device['path'] osd['journal']['size'] = journal_size.b - osd['journal']['percentage'] = round(100 - data_percentage.b) + osd['journal']['percentage'] = int(100 - data_percentage) osd['journal']['human_readable_size'] = str(journal_size) osds.append(osd)