From: Sage Weil <sage@redhat.com>
Date: Wed, 29 Jan 2020 17:05:51 +0000 (-0600)
Subject: cephadm: include daemon/unit id in unit name
X-Git-Tag: v15.1.1~620^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32970%2Fhead;p=ceph.git

cephadm: include daemon/unit id in unit name

This makes the log messages more descriptive.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 9684b91451b4..81ab147e27a3 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1400,7 +1400,7 @@ def deploy_crash(fsid, uid, gid, config, keyring):
     unit_name = 'ceph-%s-crash.service' % fsid
     with open(os.path.join(args.unit_dir, unit_name + '.new'), 'w') as f:
         f.write('[Unit]\n'
-                'Description=Ceph cluster {fsid} crash dump collector\n'
+                'Description=Ceph crash collector for {fsid}\n'
                 'PartOf=ceph-{fsid}.target\n'
                 'Before=ceph-{fsid}.target\n'
                 '\n'
@@ -1429,7 +1429,7 @@ def get_unit_file(fsid, uid, gid):
     # type: (str, int, int) -> str
     install_path = find_program('install')
     u = """[Unit]
-Description=Ceph daemon for {fsid}
+Description=Ceph %i for {fsid}
 
 # According to:
 #   http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget