From: Michael Fritch <mfritch@suse.com>
Date: Mon, 25 Jan 2021 23:08:51 +0000 (-0700)
Subject: cephadm: partal revert of 253968a2baf
X-Git-Tag: v17.1.0~3131^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=90f9899cc12c76a7957429150928b23703ecd950;p=ceph-ci.git

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 750bc5c7a22..91f1c0aa9f2 100755
--- 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)