]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: switch nvmeof class to use daemon_to_container function
authorJohn Mulligan <jmulligan@redhat.com>
Sun, 5 Nov 2023 20:17:47 +0000 (15:17 -0500)
committerJohn Mulligan <jmulligan@redhat.com>
Fri, 17 Nov 2023 13:10:11 +0000 (08:10 -0500)
Switch the nvmeof 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 7d91d90dccbdf3d0b0a68530ab3ba52f9fc91238..524a73a37009677315b13c26bc8c8e7539f9f3e8 100755 (executable)
@@ -1520,7 +1520,7 @@ class CephNvmeof(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 uid_gid(self, ctx: CephadmContext) -> Tuple[int, int]: