From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Sat, 9 Dec 2023 19:56:34 +0000 (-0500)
Subject: Merge pull request #54378 from adk3798/cephadm-jinja2-logrotate
X-Git-Tag: v19.3.0~410
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec21a4368723903a7ed88ca11955bf460b4946bb;p=ceph.git

Merge pull request #54378 from adk3798/cephadm-jinja2-logrotate

cephadm: move logrotate configs to jinja2 template

Reviewed-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

ec21a4368723903a7ed88ca11955bf460b4946bb
diff --cc src/cephadm/cephadm.py
index 98a2585c760c,50ed3d1f00fa..242c85997477
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@@ -126,9 -145,14 +126,14 @@@ from cephadmlib.net_utils import 
      wrap_ipv6,
  )
  from cephadmlib.locking import FileLock
 -from cephadmlib.daemon_identity import DaemonIdentity, DaemonSubIdentity
 +from cephadmlib.daemon_identity import DaemonIdentity
  from cephadmlib.packagers import create_packager, Packager
- from cephadmlib.logging import cephadm_init_logging, Highlight, LogDestination
+ from cephadmlib.logging import (
+     cephadm_init_logging,
+     Highlight,
+     LogDestination,
+     write_cluster_logrotate_config,
+ )
  from cephadmlib.systemd import check_unit, check_units
  from cephadmlib.container_types import (
      CephContainer,