Merge pull request #13467 from bcoca/adhoc_callbk_fix

adhoc does not load plugins by default
2015-12-08 11:28:20 -05:00 · 2015-12-08 11:28:20 -05:00 · 50e5b0f8e9
commit 50e5b0f8e9
parent e69064d0fc b07451eef8
1 changed files with 3 additions and 0 deletions
--- a/lib/ansible/cli/adhoc.py
+++ b/lib/ansible/cli/adhoc.py
@ -163,6 +163,9 @@ class AdHocCLI(CLI):
        else:
            cb = 'minimal'

+        if not C.DEFAULT_LOAD_CALLBACK_PLUGINS:
+            C.DEFAULT_CALLBACK_WHITELIST = []
+
        if self.options.tree:
            C.DEFAULT_CALLBACK_WHITELIST.append('tree')
            C.TREE_DIR = self.options.tree