From: John Mulligan Date: Sun, 5 Nov 2023 20:18:19 +0000 (-0500) Subject: cephadm: switch haproxy class to use daemon_to_container function X-Git-Tag: v19.0.0~24^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20c1e74c2fce164bc2ac7c0577e5116ac63c7f55;p=ceph.git cephadm: switch haproxy class to use daemon_to_container function Switch the haproxy 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 4d8a8c9bf95..0dda9b8b4fa 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -1753,7 +1753,7 @@ class HAproxy(ContainerDaemonForm): ] def container(self, ctx: CephadmContext) -> CephContainer: - ctr = get_container(ctx, self.identity) + ctr = daemon_to_container(ctx, self) return to_deployment_container(ctx, ctr) def customize_container_args(