From: Roy Sahar <royswi@gmail.com>
Date: Thu, 8 Feb 2024 15:58:43 +0000 (+0200)
Subject: nvmeof: Add mount for log location
X-Git-Tag: testing/wip-pdonnell-testing-20240430.123648-reef-debug~174^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9d460908bf236ecd46dc660f25153ce189e7be82;p=ceph-ci.git

nvmeof: Add mount for log location

Signed-off-by: Roy Sahar <royswi@gmail.com>
(cherry picked from commit 5c613b3788d9ae686b4dc29d9414674ecb6f6adb)

Conflicts:
	src/cephadm/cephadmlib/daemons/nvmeof.py
	src/cephadm/cephadm.py
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 99e0ac740a0..53e29a76a73 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -1194,7 +1194,7 @@ class CephNvmeof(object):
                    fetch_configs(ctx), ctx.image)
 
     @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'
@@ -1202,6 +1202,7 @@ class CephNvmeof(object):
         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
 
     @staticmethod
@@ -3610,7 +3611,8 @@ def get_container_mounts(ctx, fsid, daemon_type, daemon_id,
     if daemon_type == CephNvmeof.daemon_type:
         assert daemon_id
         data_dir = get_data_dir(fsid, ctx.data_dir, daemon_type, daemon_id)
-        mounts.update(CephNvmeof.get_container_mounts(data_dir))
+        log_dir = get_log_dir(fsid, ctx.log_dir)
+        mounts.update(CephNvmeof.get_container_mounts(data_dir, log_dir))
 
     if daemon_type == CephIscsi.daemon_type:
         assert daemon_id