import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / ceph-volume / ceph_volume / devices / lvm / strategies / filestore.py

diff --git a/ceph/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py b/ceph/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py
index 42f9179faa34c485244a54803b08ee811eba5f29..0c9ff31fb9aacb6b25f261573dbd60725981858f 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py
+++ b/ceph/src/ceph-volume/ceph_volume/devices/lvm/strategies/filestore.py
@@ -6,7 +6,7 @@ from .strategies import Strategy
 from .strategies import MixedStrategy
 from ceph_volume.devices.lvm.create import Create
 from ceph_volume.devices.lvm.prepare import Prepare
-from ceph_volume.util import templates
+from ceph_volume.util import templates, system
 from ceph_volume.exceptions import SizeAllocationError
 
 
@@ -144,12 +144,12 @@ class SingleType(Strategy):
             device_vg = device_vgs[data_path]
             data_lv_extents = device_vg.sizing(size=data_lv_size)['extents']
             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', device_vg.name, extents=data_lv_extents, uuid_name=True
-            )
+                'osd-data', data_uuid, vg=device_vg, extents=data_lv_extents)
+            journal_uuid = system.generate_uuid()
             journal_lv = lvm.create_lv(
-                'osd-journal', device_vg.name, extents=journal_lv_extents, uuid_name=True
-            )
+                '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)
 
@@ -352,7 +352,7 @@ class MixedType(MixedStrategy):
         else:
             journal_vg = self.common_vg
 
-        journal_size = prepare.get_journal_size(lv_format=True)
+        journal_size = prepare.get_journal_size(lv_format=False)
 
         # create 1 vg per data device first, mapping them to the device path,
         # when the lv gets created later, it can create as many as needed (or
@@ -367,12 +367,12 @@ class MixedType(MixedStrategy):
             data_path = osd['data']['path']
             data_vg = data_vgs[data_path]
             data_lv_extents = data_vg.sizing(parts=1)['extents']
+            data_uuid = system.generate_uuid()
             data_lv = lvm.create_lv(
-                'osd-data', data_vg.name, extents=data_lv_extents, uuid_name=True
-            )
+                'osd-data', data_uuid, vg=data_vg, extents=data_lv_extents)
+            journal_uuid = system.generate_uuid()
             journal_lv = lvm.create_lv(
-                'osd-journal', journal_vg.name, size=journal_size, uuid_name=True
-            )
+                'osd-journal', journal_uuid, vg=journal_vg, size=journal_size)
 
             command = ['--filestore', '--data']
             command.append('%s/%s' % (data_vg.name, data_lv.name))