From: Sage Weil <sage@redhat.com>
Date: Thu, 16 Jan 2020 23:21:28 +0000 (-0600)
Subject: cephadm: remove -crash container before starting it
X-Git-Tag: v15.1.0~172^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ceebfc342a5b9f03d90915c315dca2185c0b4065;p=ceph.git

cephadm: remove -crash container before starting it

This matches up with what the @.service unit does.

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 270952edad72b..7309a224c2f3f 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1277,6 +1277,7 @@ def deploy_crash(fsid, uid, gid, config, keyring):
                 '\n'
                 '[Service]\n'
                 'Type=simple\n'
+                'ExecStartPre=-{container_path} rm ceph-{fsid}-crash\n'
                 'ExecStart={cmd}\n'
                 'ExecStop=-{container_path} stop ceph-{fsid}-crash\n'
                 'Restart=always\n'