Browse Source

Merge "Honor trash_output when not using queue" into stable/queens

tags/8.7.1^0
Zuul 1 week ago
parent
commit
609c1a8d7d

+ 6
- 0
releasenotes/notes/honor_trash_output_when_not_using_queue-f7c5a3051f5b90cc.yaml View File

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

+ 3
- 0
tripleo_common/actions/ansible.py View File

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

Loading…
Cancel
Save