diff options
| author | Eugen C <armab@users.noreply.github.com> | 2017-06-26 23:01:06 +0300 |
|---|---|---|
| committer | Brian Coca <brian.coca+git@gmail.com> | 2017-06-26 16:01:01 -0400 |
| commit | 44b3d67ef31b3c4c5d33c6f4289ce011e1bbe8fe (patch) | |
| tree | 2764acb4297ae819c4afa9d56a4653274b30775e | |
| parent | ba453452f0923bc8269c7f29bc58ade3ba589b03 (diff) | |
| download | ansible-44b3d67ef31b3c4c5d33c6f4289ce011e1bbe8fe.tar.gz | |
Fix ansible ad-hoc to respect ANSIBLE_STDOUT_CALLBACK (#26098)
* Fix ansible ad-hoc to respect ANSIBLE_STDOUT_CALLBACK
* Ansible ad-hoc 'stdout_callback' should work only with 'bin_ansible_callbacks'
(cherry picked from commit 6d5916074447ecb8d3ff0ca9139c6ffde77a9335)
| -rw-r--r-- | lib/ansible/cli/adhoc.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ansible/cli/adhoc.py b/lib/ansible/cli/adhoc.py index d5d9ed1b4d..807afbe0f0 100644 --- a/lib/ansible/cli/adhoc.py +++ b/lib/ansible/cli/adhoc.py @@ -174,6 +174,9 @@ class AdHocCLI(CLI): cb = self.callback elif self.options.one_line: cb = 'oneline' + # Respect custom 'stdout_callback' only with enabled 'bin_ansible_callbacks' + elif C.DEFAULT_LOAD_CALLBACK_PLUGINS and C.DEFAULT_STDOUT_CALLBACK != 'default': + cb = C.DEFAULT_STDOUT_CALLBACK else: cb = 'minimal' |