From: Sage Weil <sage@redhat.com>
Date: Thu, 16 Jan 2020 19:24:24 +0000 (-0600)
Subject: cephadm: stop the crash container the nice way
X-Git-Tag: v15.1.0~172^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=10d3976cdea4714584b44d2b2b3f6380ebe95bc1;p=ceph.git

cephadm: stop the crash container the nice way

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 5e09a37c7d259..270952edad72b 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1278,7 +1278,7 @@ def deploy_crash(fsid, uid, gid, config, keyring):
                 '[Service]\n'
                 'Type=simple\n'
                 'ExecStart={cmd}\n'
-                'ExecStop=-{container_path} rm -f ceph-{fsid}-crash\n'
+                'ExecStop=-{container_path} stop ceph-{fsid}-crash\n'
                 'Restart=always\n'
                 'RestartSec=10\n'
                 'StartLimitInterval=10min\n'