From a7f5479a8ac6c6df52652311f5a9b370da9039b2 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 11:09:52 -0400 Subject: [PATCH] cephadm: move nfs 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 a40d022beef..644f4fa60cf 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2331,9 +2331,6 @@ def _get_daemon_args(ctx: CephadmContext, ident: 'DaemonIdentity') -> List[str]: elif daemon_type == 'jaeger-agent': tracing = Tracing.create(ctx, ident) r += tracing.get_daemon_args() - elif daemon_type == NFSGanesha.daemon_type: - nfs_ganesha = NFSGanesha.init(ctx, ident.fsid, ident.daemon_id) - r += nfs_ganesha.get_daemon_args() return r @@ -2797,6 +2794,8 @@ def get_container( entrypoint = NFSGanesha.entrypoint name = ident.daemon_name envs.extend(NFSGanesha.get_container_envs()) + nfs_ganesha = NFSGanesha.init(ctx, ident.fsid, ident.daemon_id) + d_args.extend(nfs_ganesha.get_daemon_args()) elif daemon_type == CephExporter.daemon_type: entrypoint = CephExporter.entrypoint name = 'client.ceph-exporter.%s' % ident.daemon_id -- 2.39.5