From 77e45e5395c87b2f87ae7680e20d81de6c8cb9d2 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Sat, 4 Nov 2023 18:39:07 -0400 Subject: [PATCH] cephadm: move volume mounts assignment to a variable Move the call to get_container_mounts out of the function call block. This will aid with the next refactoring steps, so that the uses of get_container_mounts can be brought into the get_container call directly. 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 9a1989a3c95..79e718afefd 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2872,13 +2872,14 @@ def get_container( d_args.extend(sg.get_daemon_args()) _update_container_args_for_podman(ctx, ident, container_args) + mounts = get_container_mounts(ctx, ident) return CephContainer.for_daemon( ctx, ident=ident, entrypoint=entrypoint, args=ceph_args + d_args, container_args=container_args, - volume_mounts=get_container_mounts(ctx, ident), + volume_mounts=mounts, bind_mounts=binds, envs=envs, privileged=privileged, -- 2.39.5