ceph-volume lvm.batch.filestore use new Device objects
authorAlfredo Deza <adeza@redhat.com>
Thu, 23 Aug 2018 14:56:09 +0000 (10:56 -0400)
committerAlfredo Deza <adeza@redhat.com>
Fri, 24 Aug 2018 14:18:05 +0000 (10:18 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py

index 8b99a52942ecaf37580f7c9de22b16d79c165064..9e80c5cbb90672f8f950d3d91c20be7db1f7884e 100644 (file)
@@ -67,17 +67,17 @@ class SingleType(object):
         osds = self.computed['osds']
         vgs = self.computed['vgs']
         for device in devices:
-            device_size = disk.Size(b=device['size'])
+            device_size = disk.Size(b=device.sys_api['size'])
             journal_size = prepare.get_journal_size(lv_format=False)
             data_size = device_size - journal_size
             data_percentage = data_size * 100 / device_size
-            vgs.append({'devices': [device['path']], 'parts': 2})
+            vgs.append({'devices': [device.abspath], 'parts': 2})
             osd = {'data': {}, 'journal': {}}
-            osd['data']['path'] = device['path']
+            osd['data']['path'] = device.abspath
             osd['data']['size'] = data_size.b
             osd['data']['percentage'] = int(data_percentage)
             osd['data']['human_readable_size'] = str(data_size)
-            osd['journal']['path'] = device['path']
+            osd['journal']['path'] = device.abspath
             osd['journal']['size'] = journal_size.b
             osd['journal']['percentage'] = int(100 - data_percentage)
             osd['journal']['human_readable_size'] = str(journal_size)