From 26abebb29317bc9855ceee5f4ab8a33ec6bd8f8d Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Thu, 18 Jun 2020 12:08:23 +0200 Subject: [PATCH] Add pre stop exec hook for container systemd units Sometimes, actions taken as the part of a container's entrypoint script should become the pre-stop actions. Allow such configurations composed for managed containers. Change-Id: I40237e2b35ce83c5b519a117a6d4e74cb845b2c3 Related-bug: #1884048 Signed-off-by: Bogdan Dobrelya --- .../tripleo_container_manage/templates/systemd-service.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2 b/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2 index 6dd3a3a58..c9ae0f9be 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2 +++ b/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2 @@ -10,6 +10,9 @@ ExecStart=/usr/libexec/tripleo-start-podman-container {{ lookup('dict', containe ExecStart=/usr/bin/podman start {{ lookup('dict', container_data_unit).key }} {% endif %} ExecReload=/usr/bin/podman kill --signal HUP {{ lookup('dict', container_data_unit).key }} +{% if lookup('dict', container_data_unit).value.pre_stop_exec is defined %} +ExecStop=-/usr/bin/podman exec {{ lookup('dict', container_data_unit).key }} {{ lookup('dict', container_data_unit).value.pre_stop_exec }} +{% endif %} ExecStop=/usr/bin/podman stop -t {{ lookup('dict', container_data_unit).value.stop_grace_period | default(10) | int }} {{ lookup('dict', container_data_unit).key }} KillMode=none Type=forking