Honor trash_output when not using queue

Previously, trash_output was not honored if a queue was not being used
to post messages.

This patch changes the behavior so that trash_output will be honored
even if a queue is not being used, and all stdout/stderr will be
discarded.

Change-Id: I4fccfa0cb2a5382a52d63598f66dae446ff29c25
Closes-Bug: #1842102
(cherry picked from commit c7d44bc2ca)
This commit is contained in:
James Slagle 2019-08-30 12:11:08 -04:00 committed by John Fulton
parent 8b6830f5bb
commit 84b68fc7af
2 changed files with 9 additions and 0 deletions

View File

@ -0,0 +1,6 @@
---
fixes:
- Previously, trash_output was not honored if a queue was not being used to
post messages. The behavior has changed so that trash_output will be
honored even if a queue is not being used, and all stdout/stderr will be
discarded.

View File

@ -540,6 +540,9 @@ class AnsiblePlaybookAction(base.TripleOAction):
*command, cwd=self.work_dir,
env_variables=env_variables,
log_errors=processutils.LogErrors.ALL)
if self.trash_output:
stdout = ""
stderr = ""
return {"stderr": stderr, "stdout": stdout,
"log_path": os.path.join(self.work_dir, 'ansible.log')}
finally: