From 7ea698c6ca819711330466ffccfe1f51f929b7d2 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 15:00:25 -0400 Subject: [PATCH] cephadm: add customize_container_mounts method to nvmeof class Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 88f26e2abff..fe67904d800 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -1298,7 +1298,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) -> 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' @@ -1308,6 +1308,12 @@ class CephNvmeof(ContainerDaemonForm): mounts['/dev/vfio/vfio'] = '/dev/vfio/vfio' 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)) + def customize_container_binds( self, ctx: CephadmContext, binds: List[List[str]] ) -> None: @@ -2690,8 +2696,8 @@ def get_container_mounts( mounts.update(HAproxy.get_container_mounts(data_dir)) if daemon_type == CephNvmeof.daemon_type: - data_dir = ident.data_dir(ctx.data_dir) - mounts.update(CephNvmeof.get_container_mounts(data_dir)) + nvmeof = CephNvmeof.create(ctx, ident) + nvmeof.customize_container_mounts(ctx, mounts) if daemon_type == CephIscsi.daemon_type: iscsi = CephIscsi.create(ctx, ident) -- 2.39.5