From b8c4f28e9717992d0871584de9e61b4a80d20dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Thu, 1 Apr 2021 08:07:29 +0200 Subject: [PATCH] Accept 142 as an exit code In the same fashion we accepted 137 and 143 exit code status in I8f19a80016a67ccad0371c5d108516aec640f031, we also accept 142. It represents the SIGALRM exit status - it happens when podman reaches the set timeout (currently 60s) when trying to cleanly stop a container. Change-Id: I2d5f4e8c11384aeff3c0b1a2fdd5abb6a586522f Closes-Bug: #1922179 Resolves: rhbz#1939910 (cherry picked from commit abbcab7d44f1d7708914f85850df6602a00142e0) --- .../roles/tripleo_container_manage/templates/systemd-service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 80e6a50f0..7513a5d76 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2 +++ b/tripleo_ansible/roles/tripleo_container_manage/templates/systemd-service.j2 @@ -15,7 +15,7 @@ ExecStop=-/usr/bin/podman exec {{ lookup('dict', container_data_unit).key }} {{ {% 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 }} -SuccessExitStatus=137 143 +SuccessExitStatus=137 142 143 KillMode=none Type=forking PIDFile=/var/run/{{ lookup('dict', container_data_unit).key }}.pid