containers: add KillMode=none to systemd templates

Because we are relying on docker|podman for managing containers then we
don't need systemd to manage the process (like kill).

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/roles/ceph-grafana/templates/grafana-server.service.j2 b/roles/ceph-grafana/templates/grafana-server.service.j2
index 144819b9efcb24118333aff3e07c3ddfe34f5142..6a9814d0192a68a6e191882f0d6ae919c6cb668e 100644 (file)
--- a/roles/ceph-grafana/templates/grafana-server.service.j2
+++ b/roles/ceph-grafana/templates/grafana-server.service.j2
@@ -23,6 +23,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=grafana-server \
   -e GF_INSTALL_PLUGINS={{ grafana_plugins|join(',') }} \
   {{ grafana_container_image }}
 ExecStop=-/usr/bin/{{ container_binary }} stop grafana-server
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2 b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
index 498922aa316efa2ea4820e475348e30471c69441..d5d5823bc3a2a1b30ce9512eb6520365c6b5cebb 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
@@ -28,6 +28,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
   --name=rbd-target-api \
   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/{{ container_binary }} stop rbd-target-api
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2 b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
index 25503cee4fde1ce6b93aa271cf25255b5658e577..4107ce9b4cc902aa5a5dd20f31685e1b75fe76ca 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
@@ -28,6 +28,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
   --name=rbd-target-gw \
   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/{{ container_binary }} stop rbd-target-gw
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
index 23803d036917fcd86f6ada85b05ba7005f76b377..eac2dbd2f89fa7332d8541cfefae96a54409b3a9 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
+++ b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
@@ -27,6 +27,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
   --name=tcmu-runner \
   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/{{ container_binary }} stop tcmu-runner
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2
index 2feccc600905022bcfed542759b1d77eab651955..8c42d42568ab76511384fcd902b1fbc269050079 100644 (file)
--- a/roles/ceph-mds/templates/ceph-mds.service.j2
+++ b/roles/ceph-mds/templates/ceph-mds.service.j2
@@ -26,6 +26,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
   --name=ceph-mds-{{ ansible_hostname }} \
   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/{{ container_binary }} stop ceph-mds-{{ ansible_hostname }}
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2
index b7af6e04b2f09a47114dc195ad79bc1890222421..c0ed52073618ab84ef9fef2da2fdf600a58cdb34 100644 (file)
--- a/roles/ceph-mgr/templates/ceph-mgr.service.j2
+++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2
@@ -25,6 +25,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
   --name=ceph-mgr-{{ ansible_hostname }} \
   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/{{ container_binary }} stop ceph-mgr-{{ ansible_hostname }}
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2
index f9a01b1b3e07e6230100406c0fbd0c9f2e6c59f3..6329af60e29fc0da5acf29464ca4f459a527dcbf 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -39,6 +39,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --name ceph-mon-%i \
   {{ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStop=-/usr/bin/{{ container_binary }} stop ceph-mon-%i
 ExecStopPost=-/bin/rm -f /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-nfs/templates/ceph-nfs.service.j2 b/roles/ceph-nfs/templates/ceph-nfs.service.j2
index 459689ef88b32e79a95a85b1a8742549c9f18414..df3bed89d1cb87fbc8eb4c24e50efb93e6652448 100644 (file)
--- a/roles/ceph-nfs/templates/ceph-nfs.service.j2
+++ b/roles/ceph-nfs/templates/ceph-nfs.service.j2
@@ -30,6 +30,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
   --name=ceph-nfs-{{ ceph_nfs_service_suffix | default(ansible_hostname) }} \
   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/{{ container_binary }} stop ceph-nfs-%i
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-node-exporter/templates/node_exporter.service.j2 b/roles/ceph-node-exporter/templates/node_exporter.service.j2
index 22f35eb2794dcc16a857164c730e3b2705a493cd..aacf93ec59f05bbab559c444b669a34747c59a57 100644 (file)
--- a/roles/ceph-node-exporter/templates/node_exporter.service.j2
+++ b/roles/ceph-node-exporter/templates/node_exporter.service.j2
@@ -21,6 +21,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=node-exporter \
   --no-collector.timex \
   --web.listen-address=:{{ node_exporter_port }}
 ExecStop=-/usr/bin/{{ container_binary }} stop node-exporter
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2
index 23a344d3300372a73c84fa442c2a1d8354beb303..1f7bf2db60252231e22170b9d53062895344e108 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd.service.j2
+++ b/roles/ceph-osd/templates/ceph-osd.service.j2
@@ -13,6 +13,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-osd-%i
 ExecStartPre=-/usr/bin/{{ container_binary }} rm -f ceph-osd-%i
 ExecStart={{ ceph_osd_docker_run_script_path }}/ceph-osd-run.sh %i
 ExecStop=-/usr/bin/{{ container_binary }} stop ceph-osd-%i
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-prometheus/templates/alertmanager.service.j2 b/roles/ceph-prometheus/templates/alertmanager.service.j2
index 64b264e0b26c234b1e353a9d54bd5096eee97508..c905cd11d631d7f892a7e954534ab41232c4fef7 100644 (file)
--- a/roles/ceph-prometheus/templates/alertmanager.service.j2
+++ b/roles/ceph-prometheus/templates/alertmanager.service.j2
@@ -26,6 +26,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=alertmanager \
   --web.external-url=http://{{ ansible_fqdn }}:{{ alertmanager_port }}/ \
   --web.listen-address=:{{ alertmanager_port }}
 ExecStop=/usr/bin/{{ container_binary }} stop alertmanager
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-prometheus/templates/prometheus.service.j2 b/roles/ceph-prometheus/templates/prometheus.service.j2
index bbaed8829726705b23d5466764050e54d3c193b9..48a1a41c6bde224bacfefe6060add6d4e4aeff1e 100644 (file)
--- a/roles/ceph-prometheus/templates/prometheus.service.j2
+++ b/roles/ceph-prometheus/templates/prometheus.service.j2
@@ -26,6 +26,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=prometheus \
   --web.external-url=http://{{ ansible_fqdn }}:{{ prometheus_port }}/ \
   --web.listen-address=:{{ prometheus_port }}
 ExecStop=/usr/bin/{{ container_binary }} stop prometheus
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
index 42cac9a2de08224a057c991469f9c4fa992c0ba3..82e2bf1617c47f31386d67971941e79a73f4edc1 100644 (file)
--- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
+++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
@@ -25,6 +25,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
   {{ ceph_rbd_mirror_docker_extra_env }} \
   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/{{ container_binary }} stop ceph-rbd-mirror-{{ ansible_hostname }}
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120

diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
index 99586ad93c5b53a82f694b8e9a17bc1cee085391..68395cd0863f12d68471f6ff2c2d28188f391093 100644 (file)
--- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
@@ -40,6 +40,7 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
   {{ ceph_rgw_docker_extra_env }} \
   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/{{ container_binary }} stop ceph-rgw-{{ ansible_hostname }}-${INST_NAME}
+KillMode=none
 Restart=always
 RestartSec=10s
 TimeoutStartSec=120