cephadm: partal revert of 253968a2baf

remove technical debt related to podman < 2.0.0

Signed-off-by: Michael Fritch <mfritch@suse.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 750bc5c7a221e70b5ecc111411e96666f450289c..91f1c0aa9f255f6ef52976662f8e7a98c956bbf0 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4386,16 +4386,10 @@ def list_daemons(ctx, detail=True, legacy_dir=None):
                         version = None
                         start_stamp = None
 
-                        if 'podman' in container_path and \
-                            get_podman_version(ctx, container_path) < (1, 6, 2):
-                            image_field = '.ImageID'
-                        else:
-                            image_field = '.Image'
-
                         out, err, code = call(ctx,
                             [
                                 container_path, 'inspect',
-                                '--format', '{{.Id}},{{.Config.Image}},{{%s}},{{.Created}},{{index .Config.Labels "io.ceph.version"}}' % image_field,
+                                '--format', '{{.Id}},{{.Config.Image}},{{.Image}},{{.Created}},{{index .Config.Labels "io.ceph.version"}}',
                                 'ceph-%s-%s' % (fsid, j)
                             ],
                             verbosity=CallVerbosity.DEBUG)