]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cephadm: fix mistaken call to get_container_mounts_for_type
authorJohn Mulligan <jmulligan@redhat.com>
Thu, 19 Oct 2023 20:33:57 +0000 (16:33 -0400)
committerJohn Mulligan <jmulligan@redhat.com>
Sat, 4 Nov 2023 18:53:06 +0000 (14:53 -0400)
When this function was refactored two variants were created:
get_container_mounts_for_type and _get_container_mounts_for_type.  The
latter doesn't append podman specific mounts so that it can be called
from other functions that do append podman specific mounts.
Unfortunately, I didn't call the correct function from
get_container_mounts and therefore it was redundantly doing the podman
mounts update. This corrects that error.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
src/cephadm/cephadm.py

index 47de7e5627be4278196684e0355e12c33d026259..4ea82676573a84c35e2fe3f578f45f8216f81a26 100755 (executable)
@@ -2561,7 +2561,7 @@ def get_container_mounts(
     """
     # unpack fsid and daemon_type from ident because they're used very frequently
     fsid, daemon_type = ident.fsid, ident.daemon_type
-    mounts = get_container_mounts_for_type(ctx, fsid, daemon_type)
+    mounts = _get_container_mounts_for_type(ctx, fsid, daemon_type)
 
     assert ident.fsid
     assert ident.daemon_id