From: John Mulligan Date: Sun, 5 Nov 2023 20:16:44 +0000 (-0500) Subject: cephadm: switch monitoring class to use daemon_to_container function X-Git-Tag: v19.0.0~24^2~10 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=14566e229698dcceb5c054e7d8faedf507035efc;p=ceph.git cephadm: switch monitoring class to use daemon_to_container function Switch the monitoring daemon type class to call daemon_to_container instead of get_container in the class's container method. This breaks a dependency loop between the class and the get_container function hopefully enabling future clean ups and code moves. Signed-off-by: John Mulligan --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 1cde594be101..e96d44b34f20 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -774,7 +774,7 @@ class Monitoring(ContainerDaemonForm): def container(self, ctx: CephadmContext) -> CephContainer: self._prevalidate(ctx) - ctr = get_container(ctx, self.identity) + ctr = daemon_to_container(ctx, self) return to_deployment_container(ctx, ctr) def uid_gid(self, ctx: CephadmContext) -> Tuple[int, int]: