From 3749d297c77e65406ddec08e7bae5cea097905d8 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Wed, 13 Jan 2021 10:17:56 -0500 Subject: [PATCH] ceph-mon: add ExecStartPre docker stop to systemd We already do that in the other systemd templates (mgr, mds, etc..) and would present to add workaround in other orchestration tool. This change is for containerized deployment only. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1882724 Signed-off-by: Dimitri Savineau --- roles/ceph-mon/templates/ceph-mon.service.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2 index ff34da2d2..e759a76c0 100644 --- a/roles/ceph-mon/templates/ceph-mon.service.j2 +++ b/roles/ceph-mon/templates/ceph-mon.service.j2 @@ -12,6 +12,8 @@ EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-mon-%i +{% else %} +ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mon-%i {% endif %} ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mon-%i ExecStartPre=/bin/sh -c '"$(command -v mkdir)" -p /etc/ceph /var/lib/ceph/mon' -- 2.47.3