From 9dd73e4de0d16aaa6cb308b04f654a089ac147f8 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Oct 2023 13:49:50 -0400 Subject: [PATCH] cephadm: move bind mounts assignment to a variable Move the call to get_container_binds out of the function call. This will aid with the next refactoring steps, so that the uses of get_container_binds 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 7d6855778af..d99af63ddef 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2876,6 +2876,7 @@ def get_container( d_args.extend(sg.get_daemon_args()) _update_container_args_for_podman(ctx, ident, container_args) + binds = get_container_binds(ctx, ident) return CephContainer.for_daemon( ctx, ident=ident, @@ -2883,7 +2884,7 @@ def get_container( args=ceph_args + d_args, container_args=container_args, volume_mounts=get_container_mounts(ctx, ident), - bind_mounts=get_container_binds(ctx, ident), + bind_mounts=binds, envs=envs, privileged=privileged, ptrace=ptrace, -- 2.39.5