cephadm: switch monitoring class to use daemon_to_container function

Switch the monitoring 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 1cde594be1017f2f37e268668c5abd9a5027bdaa..e96d44b34f20d0d67bbaf4333c2db93d5fe7ea67 100755 (executable)
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -774,7 +774,7 @@ class Monitoring(ContainerDaemonForm):
 
     def container(self, ctx: CephadmContext) -> CephContainer:
         self._prevalidate(ctx)
-        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]: