]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: remove -crash container before starting it 32685/head
authorSage Weil <sage@redhat.com>
Thu, 16 Jan 2020 23:21:28 +0000 (17:21 -0600)
committerSage Weil <sage@redhat.com>
Thu, 16 Jan 2020 23:32:48 +0000 (17:32 -0600)
This matches up with what the @.service unit does.

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

index 270952edad72becf492da38df9720b8c49abbb9c..7309a224c2f3f2c311cc02bedbbad354e0e7d898 100755 (executable)
@@ -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'