From: Sage Weil <sage@redhat.com>
Date: Wed, 23 Oct 2019 15:47:58 +0000 (-0500)
Subject: ceph-daemon: fix crash unit cleanup
X-Git-Tag: v15.1.0~1179^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a19fbfbde37a0842f7c9b5491dfd64f920540ec;p=ceph.git

ceph-daemon: fix crash unit cleanup

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 6ea7d24d9c0d..35afdc448ab5 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -897,6 +897,7 @@ def command_bootstrap():
     deploy_daemon(fsid, 'mgr', mgr_id, mgr_c, uid, gid, config, mgr_keyring)
 
     # crash unit
+    logger.info('Creating crash agent...')
     deploy_crash(fsid, uid, gid, config,
                  '[client.crash.%s]\n\tkey = %s\n' % (hostname, crash_key))
 
@@ -1316,7 +1317,7 @@ def command_rm_cluster():
     call_throws(['rm', '-f', args.unit_dir +
                              '/ceph-%s@.service' % args.fsid])
     call_throws(['rm', '-f', args.unit_dir +
-                             '/ceph-%s-crash@.service' % args.fsid])
+                             '/ceph-%s-crash.service' % args.fsid])
     call_throws(['rm', '-f', args.unit_dir +
                              '/ceph-%s.target' % args.fsid])
     call_throws(['rm', '-rf',