From: John Mulligan Date: Fri, 20 Oct 2023 14:52:56 +0000 (-0400) Subject: cephadm: move daemon args assignment to a variable X-Git-Tag: v19.0.0~150^2~8 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43051cf5fe9bdf96e9f602691eab1a40ef980cd1;p=ceph.git 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 --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index b47d12f92493..3aa030f23953 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),