]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: show podman version during `check-host` 42859/head
authorMichael Fritch <mfritch@suse.com>
Mon, 23 Aug 2021 13:47:56 +0000 (07:47 -0600)
committerMichael Fritch <mfritch@suse.com>
Wed, 25 Aug 2021 13:21:45 +0000 (07:21 -0600)
Signed-off-by: Michael Fritch <mfritch@suse.com>
src/cephadm/cephadm

index 8fdd5f5de4cd9292a3c1963a160a83d04a5c9934..06fa8aab16180c344fafade8c45c86ba9b92d164 100755 (executable)
@@ -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))