diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-08 21:44:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-08 21:44:33 -0400 |
| commit | 9e0e8485638e36f1bacbd8e1c5df134a5a7595f0 (patch) | |
| tree | 33f7bace58a88d334bbeacd11bd57cbf50cdc864 | |
| parent | 7c6971622498028a837f06a1656e2784f6328606 (diff) | |
| parent | f602a47aeaaae4dc99c96884ee6090f50d0542a4 (diff) | |
| download | openshift-9e0e8485638e36f1bacbd8e1c5df134a5a7595f0.tar.gz openshift-9e0e8485638e36f1bacbd8e1c5df134a5a7595f0.tar.bz2 openshift-9e0e8485638e36f1bacbd8e1c5df134a5a7595f0.tar.xz openshift-9e0e8485638e36f1bacbd8e1c5df134a5a7595f0.zip | |
Merge pull request #2261 from richm/ansible2-support-hack-2
make the improved log formatter work with ansible 2.1
| -rw-r--r-- | callback_plugins/default.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/callback_plugins/default.py b/callback_plugins/default.py index 31e3d7d4c..bc0b207bb 100644 --- a/callback_plugins/default.py +++ b/callback_plugins/default.py @@ -27,6 +27,12 @@ DEFAULT_MODULE = imp.load_source( DEFAULT_PATH ) +try: + from ansible.plugins.callback import CallbackBase + BASECLASS = CallbackBase +except ImportError: # < ansible 2.1 + BASECLASS = DEFAULT_MODULE.CallbackModule + class CallbackModule(DEFAULT_MODULE.CallbackModule): # pylint: disable=too-few-public-methods,no-init ''' @@ -48,7 +54,7 @@ class CallbackModule(DEFAULT_MODULE.CallbackModule): # pylint: disable=too-few- if key in result: save[key] = result.pop(key) - output = DEFAULT_MODULE.CallbackModule._dump_results(self, result) + output = BASECLASS._dump_results(self, result) # pylint: disable=protected-access for key in ['stdout', 'stderr', 'msg']: if key in save and save[key]: |