From: John Mulligan <jmulligan@redhat.com>
Date: Wed, 27 Sep 2023 22:09:47 +0000 (-0400)
Subject: cephadm: convert tracing type to a ContainerDaemonForm
X-Git-Tag: v19.0.0~277^2~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=04b2f4cddd8c1d132e3b6c31357b7455ac4b02da;p=ceph-ci.git

cephadm: convert tracing type to a ContainerDaemonForm

Signed-off-by: John Mulligan <jmulligan@redhat.com>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index bd116fd0063..5582e1ef692 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -1356,7 +1356,7 @@ class Keepalived(ContainerDaemonForm):
 
 
 @register_daemon_form
-class Tracing(DaemonForm):
+class Tracing(ContainerDaemonForm):
     """Define the configs for the jaeger tracing containers"""
 
     components: Dict[str, Dict[str, Any]] = {
@@ -1404,6 +1404,14 @@ class Tracing(DaemonForm):
     def identity(self) -> DaemonIdentity:
         return self._identity
 
+    def container(self, ctx: CephadmContext) -> CephContainer:
+        # TODO(jjm) this looks to be the only container for deployment
+        # not using get_deployment_container. Previous oversight?
+        return get_container(ctx, self.identity)
+
+    def uid_gid(self, ctx: CephadmContext) -> Tuple[int, int]:
+        return 65534, 65534
+
 ##################################
 
 
@@ -5216,18 +5224,6 @@ def _dispatch_deploy(
             deployment_type=deployment_type,
             endpoints=daemon_endpoints,
         )
-    elif daemon_type in Tracing.components:
-        uid, gid = 65534, 65534
-        c = get_container(ctx, ident)
-        deploy_daemon(
-            ctx,
-            ident,
-            c,
-            uid,
-            gid,
-            deployment_type=deployment_type,
-            endpoints=daemon_endpoints,
-        )
 
     elif daemon_type == CephadmAgent.daemon_type:
         # get current user gid and uid