From d1bb0e6c32f46fdc3012a34842fbfbd1bdfa2cde Mon Sep 17 00:00:00 2001 From: Luke Short Date: Wed, 18 Mar 2020 14:03:34 -0400 Subject: [PATCH] config-download timeout should KILL the process. The timeout command defaults to using TERM which does not always ensure that it will end soon enough. The ansible-playbook command should end as soon as possible. Change-Id: I0f97772434040f04f9495239b9a432c1ac062555 Closes-Bug: #1867968 Signed-off-by: Luke Short (cherry picked from commit 7be36f305107c0bfb4e403f5df4226635e34dffa) (cherry picked from commit 9faf10dd844b13d002b0d16413935fceae46ed4e) (cherry picked from commit c9cced6131113a0946f5a0ccd676b60b7ed0bcb6) --- tripleo_common/actions/ansible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tripleo_common/actions/ansible.py b/tripleo_common/actions/ansible.py index 671274408..5141a7f56 100644 --- a/tripleo_common/actions/ansible.py +++ b/tripleo_common/actions/ansible.py @@ -543,7 +543,8 @@ class AnsiblePlaybookAction(base.TripleOAction): 'OS_PROJECT_NAME': security_ctx.project_name}) if self.command_timeout: - command = ['timeout', self.command_timeout] + command + command = ['timeout', '-s', 'KILL', + str(self.command_timeout)] + command command = [str(c) for c in command]