]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: show podman version during `check-host`
authorMichael Fritch <mfritch@suse.com>
Mon, 23 Aug 2021 13:47:56 +0000 (07:47 -0600)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 2 Nov 2021 09:01:17 +0000 (10:01 +0100)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 44aee33945f285ed4366b960e9526ed9d1984382)

src/cephadm/cephadm

index 570133aeba5b1b5d60a55986c95cf03419e805b4..33d90d6e36984f9fc7c437dc0a438313d8e7504c 100755 (executable)
@@ -175,6 +175,9 @@ class ContainerEngine:
     def EXE(cls) -> str:
         raise NotImplementedError()
 
+    def __str__(self) -> str:
+        return f'{self.EXE} ({self.path})'
+
 
 class Podman(ContainerEngine):
     EXE = 'podman'
@@ -193,6 +196,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'
@@ -5775,7 +5782,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))