From: Dimitri Savineau Date: Mon, 26 Oct 2020 19:12:59 +0000 (-0400) Subject: ceph-volume: consume mount opt in simple activate X-Git-Tag: v15.2.8~9^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd0a698c44736b09514522b013d8c330aa4b2acf;p=ceph.git ceph-volume: consume mount opt in simple activate When running ceph-volume simple activate command on a Filestore OSD then the data device is mounted without any specific options so the one from the ceph configuration file are ignored. When deploying Filestore with the lvm subcommand then everything is fine because the filestore_activate method uses mount_osd which relies on the mount options defined in the ceph configuration file (if any). Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1891557 Fixes: https://tracker.ceph.com/issues/48018 Signed-off-by: Dimitri Savineau (cherry picked from commit 1f4301a15df82bf31468d76fbcccc1c5fa192e38) --- diff --git a/src/ceph-volume/ceph_volume/devices/simple/activate.py b/src/ceph-volume/ceph_volume/devices/simple/activate.py index 1dfc1e70d85b..7439141c03a8 100644 --- a/src/ceph-volume/ceph_volume/devices/simple/activate.py +++ b/src/ceph-volume/ceph_volume/devices/simple/activate.py @@ -9,6 +9,7 @@ from textwrap import dedent from ceph_volume import process, decorators, terminal, conf from ceph_volume.util import system, disk from ceph_volume.util import encryption as encryption_utils +from ceph_volume.util import prepare as prepare_utils from ceph_volume.systemd import systemctl @@ -181,7 +182,10 @@ class Activate(object): block_wal_device = self.get_device(osd_metadata.get('block.wal', {}).get('uuid')) if not system.device_is_mounted(data_device, destination=osd_dir): - process.run(['mount', '-v', data_device, osd_dir]) + if osd_metadata.get('type') == 'filestore': + prepare_utils.mount_osd(data_device, osd_id) + else: + process.run(['mount', '-v', data_device, osd_dir]) device_map = { 'journal': journal_device,