From c614bdb92f34f049302bad454c8fad086f5e904f Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 8 Aug 2018 15:34:38 -0400 Subject: [PATCH] ceph-volume lvm.strategies update bluestore use of Size Signed-off-by: Alfredo Deza (cherry picked from commit 75e9729b76594ce1b6504c10e613a91aea82477d) --- .../ceph_volume/devices/lvm/strategies/bluestore.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py index af89830a7cebd..d30105bcc0673 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py @@ -26,7 +26,7 @@ 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_titles @@ -129,7 +129,7 @@ class MixedType(object): db_size = str(disk.Size(b=(vg_extents['sizes']))) string = "" - string += templates.osd_header.format( + string += templates.ssd_volume_group.format( targets='block.db', total_lv_size=str(self.total_ssd_size), total_lvs=vg_extents['parts'], @@ -229,7 +229,7 @@ class MixedType(object): # the minimum alllowed for block.db self.total_ssd_size = disk.Size(b=0) for ssd in self.ssds: - self.total_ssd_size + disk.Size(b=ssd['size']) + self.total_ssd_size += disk.Size(b=ssd['size']) self.block_db_size = self.total_ssd_size / self.db_lvs self.vg_extents = lvm.sizing(self.total_ssd_size.b, parts=self.db_lvs) -- 2.39.5