ceph-volume: use Device.lvm_size in batch strategy validators

This will validate the devices on the size that lvm will allow to be
used, not the raw physical size of the device.

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

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/strategies/validators.py b/src/ceph-volume/ceph_volume/devices/lvm/strategies/validators.py
index 6b89387209630a80014fb1deb4f5aafc69e3ad1b..3d01e5778370c55e59fd76701d7ad9eb46716118 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/validators.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/validators.py
@@ -9,7 +9,7 @@ def minimum_device_size(devices, osds_per_device=1):
     """
     msg = 'Unable to use device %s %s, LVs would be smaller than 5GB'
     for device in devices:
-        device_size = disk.Size(b=device.sys_api['size'])
+        device_size = disk.Size(b=device.lvm_size.b)
         lv_size = device_size / osds_per_device
         if lv_size < disk.Size(gb=5):
             raise RuntimeError(msg % (device_size, device.path))
@@ -22,7 +22,7 @@ def minimum_device_collocated_size(devices, journal_size, osds_per_device=1):
     """
     msg = 'Unable to use device %s %s, LVs would be smaller than 5GB'
     for device in devices:
-        device_size = disk.Size(b=device.sys_api['size'])
+        device_size = disk.Size(b=device.lvm_size.b)
         lv_size = (device_size / osds_per_device) - journal_size
         if lv_size < disk.Size(gb=5):
             raise RuntimeError(msg % (device_size, device.path))