From: Sage Weil <sage@newdream.net>
Date: Thu, 11 Mar 2021 21:56:52 +0000 (-0500)
Subject: cephadm: use image id, not name, when inspecting for RepoDigests
X-Git-Tag: v17.1.0~2630^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40045%2Fhead;p=ceph.git

cephadm: use image id, not name, when inspecting for RepoDigests

The name is ambiguous, but the image_id is not!  This fixes problems
during upgrade where upgrade thinks the container is upgraded (due to
an incorrect digest) when in fact it is not.

Fixes: 0826c45e0cb5d60fcf8cd71cd14edd34a6997cd4

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 81f876d689f..7d2d2550598 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4647,7 +4647,7 @@ def list_daemons(ctx, detail=True, legacy_dir=None):
                                 out, err, code = call(
                                     ctx,
                                     [
-                                        container_path, 'image', 'inspect', image_name,
+                                        container_path, 'image', 'inspect', image_id,
                                         '--format', '{{.RepoDigests}}',
                                     ],
                                     verbosity=CallVerbosity.DEBUG)