]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: normalize image digest in 'ls' output too
authorSage Weil <sage@newdream.net>
Wed, 5 May 2021 18:42:36 +0000 (14:42 -0400)
committerSage Weil <sage@newdream.net>
Thu, 6 May 2021 15:11:14 +0000 (10:11 -0500)
We were previously only normalizing the 'inspect' output.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 06d849acfb77a189abf6e9c26b27aaaefdd77f14)

src/cephadm/cephadm

index 601b8f4a6dadafac47a3892d198f2891feede1ed..fef1ac1fa14bcb87214a0346b5433754334a44e0 100755 (executable)
@@ -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)