From 6a072f1b403c0af1255c4128bcb455cb38030a69 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 10:59:55 -0400 Subject: [PATCH] cephadm: move snmp daemon args out of _get_daemon_args Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 3aa030f239538..c3f7d9468de13 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2343,9 +2343,6 @@ def _get_daemon_args(ctx: CephadmContext, ident: 'DaemonIdentity') -> List[str]: elif daemon_type == CustomContainer.daemon_type: cc = CustomContainer.init(ctx, ident.fsid, ident.daemon_id) r.extend(cc.get_daemon_args()) - elif daemon_type == SNMPGateway.daemon_type: - sc = SNMPGateway.init(ctx, ident.fsid, ident.daemon_id) - r.extend(sc.get_daemon_args()) return r @@ -2751,6 +2748,7 @@ def get_container( entrypoint: str = '' name: str = '' ceph_args: List[str] = [] + d_args: List[str] = [] envs: List[str] = [] host_network: bool = True @@ -2841,9 +2839,10 @@ def get_container( container_args.append( f'--env-file={sg.conf_file_path}' ) + d_args.extend(sg.get_daemon_args()) _update_container_args_for_podman(ctx, ident, container_args) - d_args = _get_daemon_args(ctx, ident) + d_args.extend(_get_daemon_args(ctx, ident)) return CephContainer.for_daemon( ctx, ident=ident, -- 2.39.5