lvm/batch: adjust devices for byte based size calculation

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 9e61b80d2ce1d9ff5139dace00807f5a0cceb125)

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 fbe6aa8a32c9683de6f170d621d700ecae2b2ff4..68ffad615e7b2192982d92b3a3644e0faa0345d2 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
@@ -81,7 +81,7 @@ class SingleType(Strategy):
                 osd['data']['size'] = extents['sizes']
                 osd['data']['parts'] = extents['parts']
                 osd['data']['percentage'] = 100 / self.osds_per_device
-                osd['data']['human_readable_size'] = str(disk.Size(b=extents['sizes']))
+                osd['data']['human_readable_size'] = str(disk.Size(gb=extents['sizes']))
                 osds.append(osd)
 
         self.computed['changed'] = len(osds) > 0
@@ -103,7 +103,8 @@ class SingleType(Strategy):
 
         # create the lvs from the vgs captured in the beginning
         for create in osd_vgs.values():
-            lvs = lvm.create_lvs(create['vg'], parts=create['parts'], name_prefix='osd-data')
+            block_uuid = system.generate_uuid()
+            lvs = lvm.create_lvs('osd-data', block_uuid, vg=create['vg'], parts=create['parts'])
             vg_name = create['vg'].name
             for lv in lvs:
                 command = ['--bluestore', '--data']
@@ -357,7 +358,7 @@ class MixedType(MixedStrategy):
             data_lv_extents = data_vg.sizing(parts=self.osds_per_device)['extents']
             data_uuid = system.generate_uuid()
             data_lv = lvm.create_lv(
-                'osd-block', data_uuid, vg=data_vg.name, extents=data_lv_extents)
+                'osd-block', data_uuid, vg=data_vg, extents=data_lv_extents)
             command = [
                 '--bluestore',
                 '--data', "%s/%s" % (data_lv.vg_name, data_lv.name),
@@ -365,13 +366,13 @@ class MixedType(MixedStrategy):
             if 'block.db' in osd:
                 db_uuid = system.generate_uuid()
                 db_lv = lvm.create_lv(
-                    'osd-block-db', db_uuid, vg=db_vg.name, extents=db_lv_extents)
+                    'osd-block-db', db_uuid, vg=db_vg, extents=db_lv_extents)
                 command.extend([ '--block.db',
                                 '{}/{}'.format(db_lv.vg_name, db_lv.name)])
             if 'block.wal' in osd:
                 wal_uuid = system.generate_uuid()
                 wal_lv = lvm.create_lv(
-                    'osd-block-wal', wal_uuid, vg=wal_vg.name, extents=wal_lv_extents)
+                    'osd-block-wal', wal_uuid, vg=wal_vg, extents=wal_lv_extents)
                 command.extend(
                     ['--block.wal',
                      '{}/{}'.format(wal_lv.vg_name, wal_lv.name)

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 b10a6ac5378fee87380cc1066b835553e9be0876..95b8f841b2ff5d42d4f53168fd1f2af10184ce62 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py
@@ -146,10 +146,10 @@ class SingleType(Strategy):
             journal_lv_extents = device_vg.sizing(size=self.journal_size.gb.as_int())['extents']
             data_uuid = system.generate_uuid()
             data_lv = lvm.create_lv(
-                'osd-data', data_uuid, vg=device_vg.name, extents=data_lv_extents)
+                'osd-data', data_uuid, vg=device_vg, extents=data_lv_extents)
             journal_uuid = system.generate_uuid()
             journal_lv = lvm.create_lv(
-                'osd-journal', journal_uuid, vg=device_vg.name, extents=journal_lv_extents)
+                'osd-journal', journal_uuid, vg=device_vg, extents=journal_lv_extents)
 
             command = ['--filestore', '--data']
             command.append('%s/%s' % (device_vg.name, data_lv.name))
@@ -254,7 +254,7 @@ class MixedType(MixedStrategy):
 
         # find how many journals are possible from the common VG
         if self.common_vg:
-            common_vg_size = disk.Size(gb=self.common_vg.free)
+            common_vg_size = disk.Size(b=self.common_vg.free)
         else:
             common_vg_size = disk.Size(gb=0)
 
@@ -369,10 +369,10 @@ class MixedType(MixedStrategy):
             data_lv_extents = data_vg.sizing(parts=1)['extents']
             data_uuid = system.generate_uuid()
             data_lv = lvm.create_lv(
-                'osd-data', data_uuid, vg=data_vg.name, extents=data_lv_extents)
+                'osd-data', data_uuid, vg=data_vg, extents=data_lv_extents)
             journal_uuid = system.generate_uuid()
             journal_lv = lvm.create_lv(
-                'osd-journal', journal_uuid, vg=journal_vg.name, size=journal_size)
+                'osd-journal', journal_uuid, vg=journal_vg, size=journal_size)
 
             command = ['--filestore', '--data']
             command.append('%s/%s' % (data_vg.name, data_lv.name))