openstack
/
tripleo-common
Code Issues Proposed changes

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>
This commit is contained in:
Luke Short 2020-03-18 14:03:34 -04:00
parent 3270e4cf2c
commit 7be36f3051
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleo_common/actions/ansible.py
View File

@ -450,7 +450,8 @@ class AnsiblePlaybookAction(base.TripleOAction):
os.chmod(command_path, 0o750)
if self.command_timeout:
command = ['timeout', str(self.command_timeout)] + command
command = ['timeout', '-s', 'KILL',
str(self.command_timeout)] + command
if self.queue_name:
zaqar = self.get_messaging_client(context)