From adb1c81b1649eaef64c91512495c1b27939ba38c Mon Sep 17 00:00:00 2001 From: Matthew Vernon Date: Wed, 28 Aug 2024 16:37:46 +0100 Subject: [PATCH] cephadm: emit warning if daemon's image is not to be used If an image is not specified, cephadm shell will use the image corresponding to a Ceph daemon running on the host (and will log a debug message to that effect). However, it will only use that image if it appears in the output of: podman images --filter label=ceph=True --filter dangling=false This commit means that cephadm will emit a warning if the container image it was going to use fails this check, so the operator has more of a clue to what is going on. Fixes: https://tracker.ceph.com/issues/67778 Signed-off-by: Matthew Vernon (cherry picked from commit b863c93ef1a1ce85164584dd17c5e71441bc550f) --- src/cephadm/cephadm.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index c718106400f19..ea970489663a3 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2738,6 +2738,8 @@ def infer_local_ceph_image(ctx: CephadmContext, container_path: str) -> Optional if digest and not digest.endswith('@'): logger.info(f"Using ceph image with id '{image_id}' and tag '{tag}' created on {created_date}\n{digest}") return digest + if container_info is not None: + logger.warning(f"Not using image '{container_info.image_id}' as it's not in list of non-dangling images with ceph=True label") return None -- 2.39.5