]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume lvm.prepare detect vdo from device for mounting filestore
authorAlfredo Deza <adeza@redhat.com>
Mon, 16 Apr 2018 16:40:27 +0000 (12:40 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 18 Apr 2018 18:48:47 +0000 (14:48 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 6b87580d4fe8e86de958ac258971cb2f90a70455)

src/ceph-volume/ceph_volume/devices/lvm/prepare.py

index fa76c061bd0565b01c3509581b1805faac29f73c..89291c0309b318568f4b5d937f0bd039c524f199 100644 (file)
@@ -56,12 +56,14 @@ def prepare_filestore(device, journal, secrets, tags, osd_id, fsid):
         device = prepare_dmcrypt(key, device, 'data', tags)
         journal = prepare_dmcrypt(key, journal, 'journal', tags)
 
+    # vdo detection
+    is_vdo = api.is_vdo(device)
     # create the directory
     prepare_utils.create_osd_path(osd_id)
     # format the device
     prepare_utils.format_device(device)
     # mount the data device
-    prepare_utils.mount_osd(device, osd_id)
+    prepare_utils.mount_osd(device, osd_id, is_vdo=is_vdo)
     # symlink the journal
     prepare_utils.link_journal(journal, osd_id)
     # get the latest monmap