From: Sage Weil <sage@newdream.net>
Date: Wed, 5 May 2021 18:42:36 +0000 (-0400)
Subject: cephadm: normalize image digest in 'ls' output too
X-Git-Tag: v17.1.0~2052^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41183%2Fhead;p=ceph.git

cephadm: normalize image digest in 'ls' output too

We were previously only normalizing the 'inspect' output.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 774512ea98aa..c350eece97d1 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4860,7 +4860,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)