]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: use image id, not name, when inspecting for RepoDigests 40045/head
authorSage Weil <sage@newdream.net>
Thu, 11 Mar 2021 21:56:52 +0000 (16:56 -0500)
committerSage Weil <sage@newdream.net>
Thu, 11 Mar 2021 22:00:20 +0000 (17:00 -0500)
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>
src/cephadm/cephadm

index 81f876d689fcfd45dcbb4b3cdddcee9777f2c9be..7d2d25505989e2a39244a79f5c52d7dc372715fb 100755 (executable)
@@ -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)