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

cephadm: switch nvmeof class to use daemon_to_container function

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>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 7d91d90dccbd..524a73a37009 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -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]: