From 87c035d4380590fcbd94ca3a9b1ca4c6be08a114 Mon Sep 17 00:00:00 2001 From: Roy Sahar Date: Thu, 8 Feb 2024 17:58:43 +0200 Subject: [PATCH] nvmeof: Add mount for log location Signed-off-by: Roy Sahar (cherry picked from commit 5c613b3788d9ae686b4dc29d9414674ecb6f6adb) --- src/cephadm/cephadmlib/daemons/nvmeof.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadmlib/daemons/nvmeof.py b/src/cephadm/cephadmlib/daemons/nvmeof.py index 673761e8e6e..f22147c775c 100644 --- a/src/cephadm/cephadmlib/daemons/nvmeof.py +++ b/src/cephadm/cephadmlib/daemons/nvmeof.py @@ -63,7 +63,7 @@ class CephNvmeof(ContainerDaemonForm): return DaemonIdentity(self.fsid, self.daemon_type, self.daemon_id) @staticmethod - def _get_container_mounts(data_dir: str) -> Dict[str, str]: + def _get_container_mounts(data_dir: str, log_dir: str) -> Dict[str, str]: mounts = dict() mounts[os.path.join(data_dir, 'config')] = '/etc/ceph/ceph.conf:z' mounts[os.path.join(data_dir, 'keyring')] = '/etc/ceph/keyring:z' @@ -73,13 +73,15 @@ class CephNvmeof(ContainerDaemonForm): mounts[os.path.join(data_dir, 'configfs')] = '/sys/kernel/config' mounts['/dev/hugepages'] = '/dev/hugepages' mounts['/dev/vfio/vfio'] = '/dev/vfio/vfio' + mounts[log_dir] = '/var/log/ceph:z' return mounts def customize_container_mounts( self, ctx: CephadmContext, mounts: Dict[str, str] ) -> None: data_dir = self.identity.data_dir(ctx.data_dir) - mounts.update(self._get_container_mounts(data_dir)) + log_dir = os.path.join(ctx.log_dir, self.identity.fsid) + mounts.update(self._get_container_mounts(data_dir, log_dir)) def customize_container_binds( self, ctx: CephadmContext, binds: List[List[str]] -- 2.39.5