Browse Source

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

changes/52/682152/1
Zuul 1 week ago
parent
commit
4bf43b6b8a

+ 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

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

Loading…
Cancel
Save