From: Michael Fritch <mfritch@suse.com>
Date: Mon, 23 Aug 2021 13:47:56 +0000 (-0600)
Subject: cephadm: show podman version during `check-host`
X-Git-Tag: v17.1.0~924^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44aee33945f285ed4366b960e9526ed9d1984382;p=ceph.git

cephadm: show podman version during `check-host`

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 8fdd5f5de4cd..06fa8aab1618 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -176,6 +176,9 @@ class ContainerEngine:
     def EXE(cls) -> str:
         raise NotImplementedError()
 
+    def __str__(self) -> str:
+        return f'{self.EXE} ({self.path})'
+
 
 class Podman(ContainerEngine):
     EXE = 'podman'
@@ -194,6 +197,10 @@ class Podman(ContainerEngine):
         out, _, _ = call_throws(ctx, [self.path, 'version', '--format', '{{.Client.Version}}'])
         self._version = _parse_podman_version(out)
 
+    def __str__(self) -> str:
+        version = '.'.join(map(str, self.version))
+        return f'{self.EXE} ({self.path}) version {version}'
+
 
 class Docker(ContainerEngine):
     EXE = 'docker'
@@ -5801,7 +5808,7 @@ def command_check_host(ctx: CephadmContext) -> None:
 
     try:
         engine = check_container_engine(ctx)
-        logger.info('podman|docker (%s) is present' % engine.path)
+        logger.info(f'{engine} is present')
     except Error as e:
         errors.append(str(e))