]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: configure journald as the logdriver 37729/head
authorMichael Fritch <mfritch@suse.com>
Fri, 5 Feb 2021 01:19:25 +0000 (18:19 -0700)
committerMichael Fritch <mfritch@suse.com>
Fri, 5 Feb 2021 15:05:41 +0000 (08:05 -0700)
Introduced by e6792f306ab4d07251588fdca6ed3876ae3a092a

podman containers running in a detached `-d` state need to have a
configured logdriver for `cephadm logs` to be able to gather the daemon
output from journald

Fixes: https://tracker.ceph.com/issues/47916
Signed-off-by: Michael Fritch <mfritch@suse.com>
src/cephadm/cephadm

index 1eac0707c3d449aa535f274b49007462b02e655d..a8531bf8ee0cd72c228b6e71e75da5605a2e20ef 100755 (executable)
@@ -2420,11 +2420,13 @@ def get_container(ctx: CephadmContext,
     # so service can have Type=Forking
     if 'podman' in ctx.container_path:
         runtime_dir = '/run'
-        container_args.extend(['-d',
+        container_args.extend([
+            '-d', '--log-driver', 'journald',
             '--conmon-pidfile',
             runtime_dir + '/ceph-%s@%s.%s.service-pid' % (fsid, daemon_type, daemon_id),
             '--cidfile',
-            runtime_dir + '/ceph-%s@%s.%s.service-cid' % (fsid, daemon_type, daemon_id)])
+            runtime_dir + '/ceph-%s@%s.%s.service-cid' % (fsid, daemon_type, daemon_id),
+        ])
 
     return CephContainer(
         ctx,