diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-13 16:04:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-13 16:04:13 +0000 |
| commit | f17d3dfd971c9a1e94833341d5dc761911a7336f (patch) | |
| tree | eed3f74d2fd953cc1c9c0a2d59aac91727a0ed62 | |
| parent | 47f2d0e8c24148bb15958821bc770755d8d2f9ea (diff) | |
| parent | 540766203884ab072b65fd1d14eaa75e60696cab (diff) | |
| download | kolla-ansible-f17d3dfd971c9a1e94833341d5dc761911a7336f.tar.gz kolla-ansible-f17d3dfd971c9a1e94833341d5dc761911a7336f.zip | |
Merge "Separate outputs of kolla_toolbox inner module"
| -rw-r--r-- | ansible/library/kolla_toolbox.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/kolla-toolbox-demux-c5e8d27bc7214069.yaml | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py index b3bc82dc4..569b06052 100644 --- a/ansible/library/kolla_toolbox.py +++ b/ansible/library/kolla_toolbox.py @@ -162,7 +162,9 @@ def use_docker(module): "ANSIBLE_LOAD_CALLBACK_PLUGINS": "True"} job = client.exec_create(kolla_toolbox, command_line, 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: output = json.loads(json_output) diff --git a/releasenotes/notes/kolla-toolbox-demux-c5e8d27bc7214069.yaml b/releasenotes/notes/kolla-toolbox-demux-c5e8d27bc7214069.yaml new file mode 100644 index 000000000..514256659 --- /dev/null +++ b/releasenotes/notes/kolla-toolbox-demux-c5e8d27bc7214069.yaml @@ -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>`__ |