From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 16 Apr 2018 16:38:35 +0000 (-0400)
Subject: ceph-volume lvm.activate detect vdo from tags for mounting filestore
X-Git-Tag: v12.2.5~8^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0ed7e1ada2c0d7816573f356dcd338caad522d8;p=ceph.git

ceph-volume lvm.activate detect vdo from tags for mounting filestore

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 0deef5f53c61b4215817008c04589a4f4b5cc3b3)
---

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
index 882824a20ad..e43295b748d 100644
--- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
@@ -20,6 +20,7 @@ def activate_filestore(lvs):
     if not osd_lv:
         raise RuntimeError('Unable to find a data LV for filestore activation')
     is_encrypted = osd_lv.tags.get('ceph.encrypted', '0') == '1'
+    is_vdo = osd_lv.tags.get('ceph.vdo', '0')
 
     osd_id = osd_lv.tags['ceph.osd_id']
     conf.cluster = osd_lv.tags['ceph.cluster_name']
@@ -54,10 +55,11 @@ def activate_filestore(lvs):
         source = '/dev/mapper/%s' % osd_lv.lv_uuid
     else:
         source = osd_lv.lv_path
+
     # mount the osd
     destination = '/var/lib/ceph/osd/%s-%s' % (conf.cluster, osd_id)
     if not system.device_is_mounted(source, destination=destination):
-        process.run(['mount', '-v', source, destination])
+        prepare_utils.mount_osd(source, osd_id, is_vdo=is_vdo)
 
     # always re-do the symlink regardless if it exists, so that the journal
     # device path that may have changed can be mapped correctly every time