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 <adeza@redhat.com>
(cherry picked from commit f473bce7addbd31c7c976d2f5f1aef82696d4da1)

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 c904947f5e93a6803e91f144f08bb0e65311231e..4de8884e5b656bcf5e67a5b56dc1def31f4c1abe 100644 (file)
--- 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),