From b3cf90604d31709996538e612b1767d6fd4da8b5 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 5 Oct 2018 10:38:11 -0500 Subject: [PATCH] ceph-volume: fix bluestore strategy json reporting and type Signed-off-by: Andrew Schoen --- .../ceph_volume/devices/lvm/strategies/bluestore.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 1bdb713dd53f0..33b5b547e3021 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): @staticmethod def type(): - return "filestore.MixedType" + return "bluestore.SingleType" @property def total_osds(self): @@ -209,11 +209,11 @@ class MixedType(object): # there isn't a common vg, so a new one must be created with all # the blank SSDs self.computed['vg'] = { - 'devices': self.blank_ssds, + 'devices': ", ".join([ssd.abspath for ssd in self.blank_ssds]), 'parts': self.dbs_needed, 'percentages': self.vg_extents['percentages'], - 'sizes': self.block_db_size.b, - 'size': int(self.total_blank_ssd_size.b), + 'sizes': self.block_db_size.b.as_int(), + 'size': self.total_blank_ssd_size.b.as_int(), 'human_readable_sizes': str(self.block_db_size), 'human_readable_size': str(self.total_available_db_space), } -- 2.39.5