From: Michael Fritch <mfritch@suse.com>
Date: Thu, 16 Jan 2020 17:42:53 +0000 (-0700)
Subject: orchestra/daemon/cephadmunit: stop following logs on container exit
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fcephadmunit-podman-logs;p=teuthology.git

orchestra/daemon/cephadmunit: stop following logs on container exit

podman will exit when the container is stopped/crashed, whereas
journalctl continues to follow the log of the exited container

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

diff --git a/teuthology/orchestra/daemon/cephadmunit.py b/teuthology/orchestra/daemon/cephadmunit.py
index b835d7dd5..436723b57 100644
--- a/teuthology/orchestra/daemon/cephadmunit.py
+++ b/teuthology/orchestra/daemon/cephadmunit.py
@@ -44,7 +44,7 @@ class CephadmUnit(DaemonState):
         name = '%s.%s' % (self.type_, self.id_)
         self.remote_logger = self.remote.run(
             args=['sudo', self.use_cephadm, 'logs',
-                  '-f',
+                  '-f', '--logger', 'podman'
                   '--fsid', self.fsid,
                   '--name', name],
             logger=logging.getLogger(self.cluster + '.' + name),