cephadm: update agent unit file func to use jinja template

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 84b4a03175ff5303f892e06c5131197ee4af7b3a..8f189becaa125c7e99f69103c9eb415b7378d597 100755 (executable)
--- 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