openstack/kolla-ansible
Code Issues Proposed changes

Merge "Separate outputs of kolla_toolbox inner module"

Browse Source
This commit is contained in:
Zuul 2024-09-13 16:04:13 +00:00 committed by Gerrit Code Review
commit f17d3dfd97
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/library/kolla_toolbox.py
View File

@ -162,7 +162,9 @@ def use_docker(module):
"ANSIBLE_LOAD_CALLBACK_PLUGINS": "True"} "ANSIBLE_LOAD_CALLBACK_PLUGINS": "True"}
job = client.exec_create(kolla_toolbox, command_line, job = client.exec_create(kolla_toolbox, command_line,
environment=environment, **kwargs) environment=environment, **kwargs)
json_output = client.exec_start(job) json_output, error = client.exec_start(job, demux=True)
if error:
module.log(msg='Inner module stderr: %s' % error)
try: try:
output = json.loads(json_output) output = json.loads(json_output)

6
releasenotes/notes/kolla-toolbox-demux-c5e8d27bc7214069.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes parsing of JSON output of inner modules called by ``kolla-toolbox``
when data was returned on standard error.
`LP#2080544 <https://launchpad.net/bugs/2080544>`__