From 51f2d64ee268a8b656a1f20346b604ca2ea1050f Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 17 Jul 2023 09:28:35 -0400 Subject: [PATCH] cephadm: update agent unit file func to use jinja template Signed-off-by: John Mulligan --- src/cephadm/cephadm.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 84b4a03175f..8f189becaa1 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -3619,25 +3619,23 @@ class CephadmAgent(DaemonForm): return ('set -e\n' + f'{py3} {binary_path} agent --fsid {self.fsid} --daemon-id {self.daemon_id} &\n') def unit_file(self) -> str: - return """#generated by cephadm + ts = """#generated by cephadm [Unit] -Description=cephadm agent for cluster {fsid} +Description=cephadm agent for cluster {{agent.fsid}} -PartOf=ceph-{fsid}.target -Before=ceph-{fsid}.target +PartOf=ceph-{{agent.fsid}}.target +Before=ceph-{{agent.fsid}}.target [Service] Type=forking -ExecStart=/bin/bash {data_dir}/unit.run +ExecStart=/bin/bash {{agent.daemon_dir}}/unit.run Restart=on-failure RestartSec=10s [Install] -WantedBy=ceph-{fsid}.target -""".format( - fsid=self.fsid, - data_dir=self.daemon_dir - ) +WantedBy=ceph-{{agent.fsid}}.target +""" + return templating.template_str(self.ctx, ts, agent=self) def shutdown(self) -> None: self.stop = True -- 2.39.5