From: Alfredo Deza Date: Wed, 8 Aug 2018 19:40:24 +0000 (-0400) Subject: ceph-volume lvm.strategies fix a bug where incorrect template was used X-Git-Tag: v14.0.1~520^2~3^2~14 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f473bce7addbd31c7c976d2f5f1aef82696d4da1;p=ceph-ci.git ceph-volume lvm.strategies fix a bug where incorrect template was used The template wouldn't render the total OSDs and the removed section was repeated Signed-off-by: Alfredo Deza --- 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 c904947f5e9..4de8884e5b6 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py @@ -135,15 +135,10 @@ class MixedType(object): db_size = str(disk.Size(b=(vg_extents['sizes']))) string = "" - string += templates.ssd_volume_group.format( - targets='block.db', - total_lv_size=str(self.total_ssd_size), - total_lvs=vg_extents['parts'], - block_lv_size=db_size, - block_db_devices=', '.join([ssd['path'] for ssd in self.ssds]), - lv_size=str(disk.Size(b=(vg_extents['sizes']))), + string += templates.total_osds.format( total_osds=len(self.hdds) ) + string += templates.ssd_volume_group.format( target='block.db', total_lv_size=str(self.total_ssd_size),