cephadm: switch custom container class to use daemon_to_container function

Switch the custom container 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>

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index c5ea9c5bbe08ba683378aa1a998ab49321875b4a..70c36d8c57e4e802eaa167973fb3ddfc785920b7 100755 (executable)
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -2142,9 +2142,10 @@ class CustomContainer(ContainerDaemonForm):
 
     def container(self, ctx: CephadmContext) -> CephContainer:
         if self._container is None:
-            ctr = get_container(
+            ctr = daemon_to_container(
                 ctx,
-                self.identity,
+                self,
+                host_network=False,
                 privileged=self.privileged,
                 ptrace=ctx.allow_ptrace,
             )