openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Wrap stopping podman -t with systemd timeouts" into stable/wallaby

This commit is contained in:
Zuul 2021-11-04 16:58:26 +00:00 committed by Gerrit Code Review
parent fac0d1fc53 f34dc5420c
commit 8721cd1c9d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2
View File

@ -13,10 +13,10 @@ ExecReload=/usr/bin/podman kill --signal HUP {{ lookup('dict', container_data_un
{% 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 }}
ExecStopPost=/usr/bin/podman stop -t {{ lookup('dict', container_data_unit).value.stop_grace_period | default(10) | int }} {{ lookup('dict', container_data_unit).key }}
ExecStop=/usr/bin/podman stop -t {{ lookup('dict', container_data_unit).value.stop_grace_period | default(42) | int }} {{ lookup('dict', container_data_unit).key }}
ExecStopPost=/usr/bin/podman stop -t {{ lookup('dict', container_data_unit).value.stop_grace_period | default(42) | int }} {{ lookup('dict', container_data_unit).key }}
SuccessExitStatus=137 142 143
KillMode=none
TimeoutStopSec={{ 2*lookup('dict', container_data_unit).value.stop_grace_period | default(42) | int }}
Type=forking
PIDFile=/run/{{ lookup('dict', container_data_unit).key }}.pid
{% if lookup('dict', container_data_unit).value.systemd_exec_flags is defined %}