]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: move daemon args assignment to a variable
authorJohn Mulligan <jmulligan@redhat.com>
Fri, 20 Oct 2023 14:52:56 +0000 (10:52 -0400)
committerJohn Mulligan <jmulligan@redhat.com>
Sat, 4 Nov 2023 18:53:06 +0000 (14:53 -0400)
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 <jmulligan@redhat.com>
src/cephadm/cephadm.py

index b47d12f92493f39a041989af734da5e7de73ccd3..3aa030f239538cf9adeee5279cb69d43fe0f231e 100755 (executable)
@@ -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),