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>

diff --cc src/cephadm/cephadm.py
index 98a2585c760c39e9b9a3d07978205d35ea2c6a2d,50ed3d1f00fa388bda8048aec28662ded131cfd6..242c859974777eaa5207cfbd4517657630959e2a
--- 1/src/cephadm/cephadm.py
--- 2/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,

diff --cc src/cephadm/cephadmlib/templating.py
Simple merge