From: John Mulligan Date: Thu, 19 Oct 2023 20:33:57 +0000 (-0400) Subject: cephadm: fix mistaken call to get_container_mounts_for_type X-Git-Tag: v19.0.0~150^2~20 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0974395e0030dcfdf31c27e92255ebbb8d43d00;p=ceph.git cephadm: fix mistaken call to get_container_mounts_for_type 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 --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 47de7e5627be..4ea82676573a 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -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