From: Gil Bregman <gbregman@il.ibm.com>
Date: Wed, 20 Aug 2025 09:48:54 +0000 (+0300)
Subject: cephadm/cephadmlib: Eliminate false warnings about old sysctl conf files.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F65147%2Fhead;p=ceph.git

cephadm/cephadmlib: Eliminate false warnings about old sysctl conf files.

Fixes: https://tracker.ceph.com/issues/72657

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
---

diff --git a/src/cephadm/cephadmlib/sysctl.py b/src/cephadm/cephadmlib/sysctl.py
index 4551ec20d379..d62f36046c9f 100644
--- a/src/cephadm/cephadmlib/sysctl.py
+++ b/src/cephadm/cephadmlib/sysctl.py
@@ -40,7 +40,7 @@ def install_sysctl(
     conf = Path(ctx.sysctl_dir).joinpath(f'90-ceph-{fsid}-{daemon_type}.conf')
 
     for conf_file in Path(ctx.sysctl_dir).glob('90-ceph-*.conf'):
-        if conf_file.name == f'90-ceph-{fsid}-{daemon_type}.conf':
+        if conf_file.name.startswith(f'90-ceph-{fsid}-'):
             continue
         logger.warning(
             f'Found a sysctl config file for a cluster with a different FSID '