From: John Mulligan Date: Sat, 14 Oct 2023 15:21:05 +0000 (-0400) Subject: cephadm: change version checks to use supports_split_cgroups method X-Git-Tag: v19.0.0~177^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86422b65d537c94605c2d4803132f6b464d808fa;p=ceph.git cephadm: change version checks to use supports_split_cgroups method Use the recently added supports_split_cgroups method instead of checking for an exact version. Signed-off-by: John Mulligan --- diff --git a/src/cephadm/cephadmlib/context_getters.py b/src/cephadm/cephadmlib/context_getters.py index a78c67a7812..0bd0c0e5e6c 100644 --- a/src/cephadm/cephadmlib/context_getters.py +++ b/src/cephadm/cephadmlib/context_getters.py @@ -6,7 +6,6 @@ import os from typing import Any, Dict, List, Optional, Tuple, Union -from .constants import CGROUPS_SPLIT_PODMAN_VERSION from .container_engines import Podman from .context import CephadmContext from .exceptions import Error @@ -186,5 +185,5 @@ def should_log_to_journald(ctx: CephadmContext) -> bool: return ctx.log_to_journald return ( isinstance(ctx.container_engine, Podman) - and ctx.container_engine.version >= CGROUPS_SPLIT_PODMAN_VERSION + and ctx.container_engine.supports_split_cgroups )