Merge "Wrap stopping podman -t with systemd timeouts" into stable/victoria
This commit is contained in:
commit
397cd95fae
|
@ -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 %}
|
{% 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 }}
|
ExecStop=-/usr/bin/podman exec {{ lookup('dict', container_data_unit).key }} {{ lookup('dict', container_data_unit).value.pre_stop_exec }}
|
||||||
{% endif %}
|
{% 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 }}
|
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(10) | 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
|
SuccessExitStatus=137 142 143
|
||||||
KillMode=none
|
TimeoutStopSec={{ 2*lookup('dict', container_data_unit).value.stop_grace_period | default(42) | int }}
|
||||||
Type=forking
|
Type=forking
|
||||||
PIDFile=/var/run/{{ lookup('dict', container_data_unit).key }}.pid
|
PIDFile=/var/run/{{ lookup('dict', container_data_unit).key }}.pid
|
||||||
{% if lookup('dict', container_data_unit).value.systemd_exec_flags is defined %}
|
{% if lookup('dict', container_data_unit).value.systemd_exec_flags is defined %}
|
||||||
|
|
Loading…
Reference in New Issue