Merge pull request ceph#37729 from mgfritch/cephadm-podman-logdriver

cephadm: configure journald as the logdriver Reviewed-by: Adam King <[email protected]> Reviewed-by: Dimitri Savineau <[email protected]>
areed · Feb 8, 2021 · 602a913 · 602a913
2 parents f635555 + 7c44f21
commit 602a913
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
@@ -2370,11 +2370,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,