]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: switch keepalived class to use daemon_to_container function
authorJohn Mulligan <jmulligan@redhat.com>
Sun, 5 Nov 2023 20:18:33 +0000 (15:18 -0500)
committerJohn Mulligan <jmulligan@redhat.com>
Fri, 17 Nov 2023 13:10:11 +0000 (08:10 -0500)
Switch the keepalived 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 <jmulligan@redhat.com>
src/cephadm/cephadm.py

index 0dda9b8b4fa43b1ae1254d726e7e23005ec39b5a..fddb63e4a90f547ea069bd6636db95d25a3a391a 100755 (executable)
@@ -1885,7 +1885,7 @@ class Keepalived(ContainerDaemonForm):
         mounts.update(self._get_container_mounts(data_dir))
 
     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_envs(