]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume lvm.strategies update bluestore use of Size
authorAlfredo Deza <adeza@redhat.com>
Wed, 8 Aug 2018 19:34:38 +0000 (15:34 -0400)
committerAndrew Schoen <aschoen@redhat.com>
Tue, 28 Aug 2018 20:32:26 +0000 (15:32 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 75e9729b76594ce1b6504c10e613a91aea82477d)

src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py

index af89830a7cebdad0050820f6b5681349e66786d7..d30105bcc06731948d1514daab8ee6689ffe76a9 100644 (file)
@@ -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)