]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume lvm.batch.bluestore consume --block-db-size
authorAlfredo Deza <adeza@redhat.com>
Wed, 19 Sep 2018 21:39:59 +0000 (17:39 -0400)
committerAlfredo Deza <adeza@redhat.com>
Thu, 20 Sep 2018 15:02:13 +0000 (11:02 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py

index 78933fa6ec47cb6e42d019fce0bc946f7f46048a..b126ba3e2580fe4e2edc20aacead47cb6d395321 100644 (file)
@@ -136,7 +136,7 @@ class MixedType(object):
         self.hdds = [device for device in devices if device.sys_api['rotational'] == '1']
         self.ssds = [device for device in devices if device.sys_api['rotational'] == '0']
         self.computed = {'osds': []}
-        self.block_db_size = prepare.get_block_db_size(lv_format=False) or disk.Size(b=0)
+        self.block_db_size = self.get_block_size()
         self.system_vgs = lvm.VolumeGroups()
         self.dbs_needed = len(self.hdds) * self.osds_per_device
         self.validate()
@@ -145,6 +145,12 @@ class MixedType(object):
     def report_json(self):
         print(json.dumps(self.computed, indent=4, sort_keys=True))
 
+    def get_block_size(self):
+        if self.args.block_db_size:
+            return disk.Size(b=self.args.block_db_size)
+        else:
+            return prepare.get_block_db_size(lv_format=False) or disk.Size(b=0)
+
     def report_pretty(self):
         vg_extents = lvm.sizing(self.total_available_db_space.b, parts=self.dbs_needed)
         db_size = str(disk.Size(b=(vg_extents['sizes'])))