ceph-volume: use Device.lvm_size in batch strategies

We should show the user what the size of the device will be after lvm
creates a pv out of it. This way there isn't a discrepency between the
sizes that are reported to the user and what is actually created.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

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 f3898d759a71167054b63e3499422f6d154ca0ba..318f6f6c1112c950fb98a1ac86d0249dba40f336 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
@@ -85,16 +85,16 @@ class SingleType(object):
             for hdd in range(self.osds_per_device):
                 osd = {'data': {}, 'block.db': {}}
                 osd['data']['path'] = device.abspath
-                osd['data']['size'] = device.sys_api['size'] / self.osds_per_device
+                osd['data']['size'] = device.lvm_size.b / self.osds_per_device
                 osd['data']['parts'] = self.osds_per_device
                 osd['data']['percentage'] = 100 / self.osds_per_device
                 osd['data']['human_readable_size'] = str(
-                    disk.Size(b=device.sys_api['size']) / self.osds_per_device
+                    disk.Size(b=device.lvm_size.b) / self.osds_per_device
                 )
                 osds.append(osd)
 
         for device in self.ssds:
-            extents = lvm.sizing(device.sys_api['size'], parts=self.osds_per_device)
+            extents = lvm.sizing(device.lvm_size.b, parts=self.osds_per_device)
             for ssd in range(self.osds_per_device):
                 osd = {'data': {}, 'block.db': {}}
                 osd['data']['path'] = device.abspath
@@ -236,10 +236,10 @@ class MixedType(object):
             for hdd in range(self.osds_per_device):
                 osd = {'data': {}, 'block.db': {}}
                 osd['data']['path'] = device.abspath
-                osd['data']['size'] = device.sys_api['size'] / self.osds_per_device
+                osd['data']['size'] = device.lvm_size.b / self.osds_per_device
                 osd['data']['percentage'] = 100 / self.osds_per_device
                 osd['data']['human_readable_size'] = str(
-                    disk.Size(b=(device.sys_api['size'])) / self.osds_per_device
+                    disk.Size(b=device.lvm_size.b) / self.osds_per_device
                 )
                 osd['block.db']['path'] = 'vg: %s' % vg_name
                 osd['block.db']['size'] = int(self.block_db_size.b)
@@ -357,7 +357,7 @@ class MixedType(object):
         self.blank_ssds = set(self.ssds).difference(self.vg_ssds)
         self.total_blank_ssd_size = disk.Size(b=0)
         for blank_ssd in self.blank_ssds:
-            self.total_blank_ssd_size += disk.Size(b=blank_ssd.sys_api['size'])
+            self.total_blank_ssd_size += disk.Size(b=blank_ssd.lvm_size.b)
 
         self.total_available_db_space = self.total_blank_ssd_size + common_vg_size
 

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py
index a9d04e127564f9a6851b979488cb1e5ba09805f8..fb378b8b982ba559e10398026358a6ebed559e57 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py
@@ -111,7 +111,7 @@ class SingleType(object):
         osds = self.computed['osds']
         for device in devices:
             for osd in range(self.osds_per_device):
-                device_size = disk.Size(b=device.sys_api['size'])
+                device_size = disk.Size(b=device.lvm_size.b)
                 osd_size = device_size / self.osds_per_device
                 journal_size = self.journal_size
                 data_size = osd_size - journal_size
@@ -291,7 +291,7 @@ class MixedType(object):
         self.blank_ssds = set(self.ssds).difference(self.vg_ssds)
         self.total_blank_ssd_size = disk.Size(b=0)
         for blank_ssd in self.blank_ssds:
-            self.total_blank_ssd_size += disk.Size(b=blank_ssd.sys_api['size'])
+            self.total_blank_ssd_size += disk.Size(b=blank_ssd.lvm_size.b)
 
         self.total_available_journal_space = self.total_blank_ssd_size + common_vg_size
 
@@ -340,7 +340,7 @@ class MixedType(object):
 
         for device in self.hdds:
             for osd in range(self.osds_per_device):
-                device_size = disk.Size(b=device.sys_api['size'])
+                device_size = disk.Size(b=device.lvm_size.b)
                 data_size = device_size / self.osds_per_device
                 osd = {'data': {}, 'journal': {}}
                 osd['data']['path'] = device.path