From c58bd7c013c10cb949bdf02001256c842940e27c Mon Sep 17 00:00:00 2001 From: Alexander Indenbaum Date: Wed, 10 Apr 2024 11:42:12 +0300 Subject: [PATCH] nvmeof: fix backport commit Resolves bug introduced in fcfa6e797f021886971e3af97a5158797cd2d96f There are two 'fsid' references as self scoped variables in upstream, should be local variables in downstream. Resolves: rhbz#2274305 Signed-off-by: Alexander Indenbaum --- src/cephadm/cephadm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index e2a8d8a2a81..2dfc1b05f99 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -3695,8 +3695,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) - log_dir = os.path.join(ctx.log_dir, self.identity.fsid) - mtls_dir = os.path.join(ctx.data_dir, self.identity.fsid, 'mtls') + log_dir = os.path.join(ctx.log_dir, fsid) + mtls_dir = os.path.join(ctx.data_dir, fsid, 'mtls') if os.path.exists(mtls_dir): mounts.update(CephNvmeof.get_container_mounts(data_dir, log_dir, mtls_dir=mtls_dir)) else: -- 2.47.3