Skip to content

Commit 37bd93e

Browse files
authored
Merge pull request ceph#65147 from gbregman/main
cephadm/cephadmlib: Eliminate false warnings about old sysctl conf files
2 parents f561fe3 + 51a4dd0 commit 37bd93e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/cephadm/cephadmlib/sysctl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def _write(conf: Path, lines: List[str]) -> None:
4040
conf = Path(ctx.sysctl_dir).joinpath(f'90-ceph-{fsid}-{daemon_type}.conf')
4141

4242
for conf_file in Path(ctx.sysctl_dir).glob('90-ceph-*.conf'):
43-
if conf_file.name == f'90-ceph-{fsid}-{daemon_type}.conf':
43+
if conf_file.name.startswith(f'90-ceph-{fsid}-'):
4444
continue
4545
logger.warning(
4646
f'Found a sysctl config file for a cluster with a different FSID '

0 commit comments

Comments
 (0)