From 43051cf5fe9bdf96e9f602691eab1a40ef980cd1 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 10:52:56 -0400 Subject: [PATCH] cephadm: move daemon args assignment to a variable Move the call to _get_daemon_args out of the function call. This will aid with the next refactoring steps, were the content of _get_daemon_args will be lifted into get_container. Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index b47d12f9249..3aa030f2395 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2843,11 +2843,12 @@ def get_container( ) _update_container_args_for_podman(ctx, ident, container_args) + d_args = _get_daemon_args(ctx, ident) return CephContainer.for_daemon( ctx, ident=ident, entrypoint=entrypoint, - args=ceph_args + _get_daemon_args(ctx, ident), + args=ceph_args + d_args, container_args=container_args, volume_mounts=get_container_mounts(ctx, ident), bind_mounts=get_container_binds(ctx, ident), -- 2.39.5