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>
(cherry picked from commit f6e802a0d865f64c5e408bdef8e6c3153b1e9842)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 122b4842f4c6fa1a80a3f63024d8b1c320917b65..fc1785e5113f7fb0db21b0a80b6fd4274b3ef505 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4645,7 +4645,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)