From c74662e6d4812be9bc7e321bc2abe0ae044b37b1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 5 May 2021 14:42:36 -0400 Subject: [PATCH] cephadm: normalize image digest in 'ls' output too We were previously only normalizing the 'inspect' output. Signed-off-by: Sage Weil (cherry picked from commit 06d849acfb77a189abf6e9c26b27aaaefdd77f14) --- src/cephadm/cephadm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 601b8f4a6dada..fef1ac1fa14bc 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -4799,7 +4799,9 @@ def list_daemons(ctx, detail=True, legacy_dir=None): ], verbosity=CallVerbosity.DEBUG) if not code: - image_digests = out.strip()[1:-1].split(' ') + image_digests = list(set(map( + normalize_image_digest, + out.strip()[1:-1].split(' ')))) seen_digests[image_id] = image_digests # identify software version inside the container (if we can) -- 2.39.5