summaryrefslogtreecommitdiffstats
path: root/callback_plugins
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-29 16:39:32 -0500
committerGitHub <noreply@github.com>2016-11-29 16:39:32 -0500
commite4a010aa08356e10fab9e9a4904dbd8491a74b8f (patch)
treed146f1e12c8efb25fac17eff70e5e38d8d7db511 /callback_plugins
parentf5a8207ad149fe8e67621b0b8fb585a48b3a1ca0 (diff)
parent81d8b6a835de79f18b2cae87b7b58ba4d02f0b14 (diff)
downloadopenshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.gz
openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.bz2
openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.xz
openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.zip
Merge pull request #2855 from detiber/updateSchedulerDefaults
Update scheduler defaults
Diffstat (limited to 'callback_plugins')
-rw-r--r--callback_plugins/default.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/callback_plugins/default.py b/callback_plugins/default.py
index c64145b5c..97ad77724 100644
--- a/callback_plugins/default.py
+++ b/callback_plugins/default.py
@@ -30,7 +30,7 @@ DEFAULT_MODULE = imp.load_source(
try:
from ansible.plugins.callback import CallbackBase
BASECLASS = CallbackBase
-except ImportError: # < ansible 2.1
+except ImportError: # < ansible 2.1
BASECLASS = DEFAULT_MODULE.CallbackModule
@@ -46,6 +46,7 @@ class CallbackModule(DEFAULT_MODULE.CallbackModule): # pylint: disable=too-few-
CALLBACK_NAME = 'default'
def __init__(self, *args, **kwargs):
+ # pylint: disable=non-parent-init-called
BASECLASS.__init__(self, *args, **kwargs)
def _dump_results(self, result):
@@ -57,7 +58,7 @@ class CallbackModule(DEFAULT_MODULE.CallbackModule): # pylint: disable=too-few-
if key in result:
save[key] = result.pop(key)
- output = BASECLASS._dump_results(self, result) # pylint: disable=protected-access
+ output = BASECLASS._dump_results(self, result) # pylint: disable=protected-access
for key in ['stdout', 'stderr', 'msg']:
if key in save and save[key]: