From e6cb7695655af6b06c51dc8788b22751dd976cba Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 11:13:52 -0400 Subject: [PATCH] cephadm: move monitoring daemon args out of _get_daemon_args Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 3c95123046f..2c3e325c0a5 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2325,9 +2325,6 @@ def _get_daemon_args(ctx: CephadmContext, ident: 'DaemonIdentity') -> List[str]: if Ceph.for_daemon_type(daemon_type) or OSD.for_daemon_type(daemon_type): daemon = Ceph.create(ctx, ident) r += daemon.get_daemon_args() - elif daemon_type in Monitoring.components: - monitoring = Monitoring.create(ctx, ident) - r += monitoring.get_daemon_args() return r @@ -2781,6 +2778,8 @@ def get_container( # '--path.rootfs=/rootfs' for node-exporter we need to disable selinux separation # between the node-exporter container and the host to avoid selinux denials container_args.extend(['--security-opt', 'label=disable']) + monitoring = Monitoring.create(ctx, ident) + d_args.extend(monitoring.get_daemon_args()) elif daemon_type in Tracing.components: entrypoint = '' name = ident.daemon_name -- 2.39.5