From: John Mulligan <jmulligan@redhat.com>
Date: Fri, 20 Oct 2023 15:11:27 +0000 (-0400)
Subject: cephadm: move jaeger tracing daemon args out of _get_daemon_args
X-Git-Tag: v19.0.0~150^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c20c7096de3f77968537f0b6dd9f8263bf08b4b;p=ceph.git

cephadm: move jaeger tracing daemon args out of _get_daemon_args

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

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 644f4fa60cf5..3c95123046f9 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -2328,9 +2328,6 @@ def _get_daemon_args(ctx: CephadmContext, ident: 'DaemonIdentity') -> List[str]:
     elif daemon_type in Monitoring.components:
         monitoring = Monitoring.create(ctx, ident)
         r += monitoring.get_daemon_args()
-    elif daemon_type == 'jaeger-agent':
-        tracing = Tracing.create(ctx, ident)
-        r += tracing.get_daemon_args()
 
     return r
 
@@ -2790,6 +2787,9 @@ def get_container(
         config = fetch_configs(ctx)
         Tracing.set_configuration(config, daemon_type)
         envs.extend(Tracing.components[daemon_type].get('envs', []))
+        if daemon_type == 'jaeger-agent':
+            tracing = Tracing.create(ctx, ident)
+            d_args.extend(tracing.get_daemon_args())
     elif daemon_type == NFSGanesha.daemon_type:
         entrypoint = NFSGanesha.entrypoint
         name = ident.daemon_name