From b8a171e34f09e2251bb807ef96b4481522f5aa80 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 11:03:52 -0400 Subject: [PATCH] cephadm: move custom container daemon args out of _get_daemon_args Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index c3f7d9468de13..0d820cb2128f0 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2340,9 +2340,6 @@ def _get_daemon_args(ctx: CephadmContext, ident: 'DaemonIdentity') -> List[str]: elif daemon_type == HAproxy.daemon_type: haproxy = HAproxy.init(ctx, ident.fsid, ident.daemon_id) r += haproxy.get_daemon_args() - elif daemon_type == CustomContainer.daemon_type: - cc = CustomContainer.init(ctx, ident.fsid, ident.daemon_id) - r.extend(cc.get_daemon_args()) return r @@ -2834,6 +2831,7 @@ def get_container( host_network = False envs.extend(cc.get_container_envs()) container_args.extend(cc.get_container_args()) + d_args.extend(cc.get_daemon_args()) elif daemon_type == SNMPGateway.daemon_type: sg = SNMPGateway.init(ctx, ident.fsid, ident.daemon_id) container_args.append( -- 2.39.5