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 <ekultails@gmail.com>
(cherry picked from commit 7be36f3051)
(cherry picked from commit 9faf10dd84)
(cherry picked from commit c9cced6131)
This commit is contained in:
Luke Short 2020-03-18 14:03:34 -04:00
parent 5cd39ae6a0
commit d1bb0e6c32
1 changed files with 2 additions and 1 deletions

View File

@ -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]