From: John Mulligan <jmulligan@redhat.com>
Date: Sun, 5 Nov 2023 20:18:57 +0000 (-0500)
Subject: cephadm: switch custom container class to use daemon_to_container function
X-Git-Tag: v19.0.0~24^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=66d4a47ca8c6588409e9d0f5975bab36fc37a8e4;p=ceph.git

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 c5ea9c5bbe0..70c36d8c57e 100755
--- 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,
             )