]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-mon: add ExecStartPre docker stop to systemd
authorDimitri Savineau <dsavinea@redhat.com>
Wed, 13 Jan 2021 15:17:56 +0000 (10:17 -0500)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Fri, 29 Jan 2021 17:00:21 +0000 (12:00 -0500)
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 <dsavinea@redhat.com>
(cherry picked from commit 3749d297c77e65406ddec08e7bae5cea097905d8)

roles/ceph-mon/templates/ceph-mon.service.j2

index 67280a0defb325f5ed45cb93126a29bb20cc33b4..4bbe82ecbe235091e4b14b7cbd5e19c4c60d87e5 100644 (file)
@@ -9,6 +9,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/environment
+ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mon-%i
 ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mon-%i
 ExecStartPre=/bin/sh -c '"$(command -v mkdir)" -p /etc/ceph /var/lib/ceph/mon'
 ExecStart=/usr/bin/{{ container_binary }} run --rm --name ceph-mon-%i \