From 5f35910ee102092faffe90980a713c5309668e20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 28 Sep 2018 18:05:42 +0200 Subject: [PATCH] osd: change unit template for ceph-volume container MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We don't need to pass the hostname on the container name but we can keep it simple and just call it ceph-osd-$id. Signed-off-by: Sébastien Han --- roles/ceph-osd/templates/ceph-osd.service.j2 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2 index 0e7dae3f0..d7297e0e8 100644 --- a/roles/ceph-osd/templates/ceph-osd.service.j2 +++ b/roles/ceph-osd/templates/ceph-osd.service.j2 @@ -5,10 +5,19 @@ After=docker.service [Service] EnvironmentFile=-/etc/environment +{% if osd_scenario == 'lvm' -%} +ExecStartPre=-/usr/bin/docker stop ceph-osd-%i +ExecStartPre=-/usr/bin/docker rm -f ceph-osd-%i +{% else %} ExecStartPre=-/usr/bin/docker stop ceph-osd-{{ ansible_hostname }}-%i ExecStartPre=-/usr/bin/docker rm -f ceph-osd-{{ ansible_hostname }}-%i +{% endif -%} ExecStart={{ ceph_osd_docker_run_script_path }}/ceph-osd-run.sh %i +{% if osd_scenario == 'lvm' -%} +ExecStop=-/usr/bin/docker stop ceph-osd-%i +{% else %} ExecStop=-/usr/bin/docker stop ceph-osd-{{ ansible_hostname }}-%i +{% endif -%} Restart=always RestartSec=10s TimeoutStartSec=120 -- 2.39.5