ceph-daemon: fix pod stop

- rm -f, not stop, so we don't leave things lingering in 'podman ps -a'
  output
- this also seems to fix/work around a problem where stopping the container
  leaves the daemon running?

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

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 8acf4a258a4a17ca5b51f276c560ce31d35d42ef..87fa36a05f2f7a8c69a644dd2c944c31973127f3 100755 (executable)
--- a/src/ceph-daemon/ceph-daemon
+++ b/src/ceph-daemon/ceph-daemon
@@ -829,7 +829,7 @@ def deploy_crash(fsid, uid, gid, config, keyring):
                 '[Service]\n'
                 'Type=simple\n'
                 'ExecStart={cmd}\n'
-                'ExecStop=-{container_path} stop ceph-{fsid}-crash\n'
+                'ExecStop=-{container_path} rm -f ceph-{fsid}-crash\n'
                 'Restart=always\n'
                 'RestartSec=10\n'
                 'StartLimitInterval=10min\n'
@@ -869,7 +869,7 @@ EnvironmentFile=-/etc/environment
 ExecStartPre=-{container_path} rm ceph-{fsid}-%i
 ExecStartPre=-{install_path} -d -m0770 -o {uid} -g {gid} /var/run/ceph/{fsid}
 ExecStart=/bin/bash {data_dir}/{fsid}/%i/cmd
-ExecStop=-{container_path} stop ceph-{fsid}-%i
+ExecStop=-{container_path} rm -f ceph-{fsid}-%i
 Restart=on-failure
 RestartSec=10s
 TimeoutStartSec=120