diff --git a/callback_plugins/fedmsg_callback.py b/callback_plugins/fedmsg_callback.py index 5dd5509089..bf00b31808 100644 --- a/callback_plugins/fedmsg_callback.py +++ b/callback_plugins/fedmsg_callback.py @@ -22,6 +22,11 @@ import pwd import fedmsg import fedmsg.config +try: + from ansible.plugins.callback import CallbackBase +except ImportError: + # Ansible v1 compat + CallbackBase = object def getlogin(): try: @@ -31,7 +36,7 @@ def getlogin(): return user -class CallbackModule(object): +class CallbackModule(CallbackBase): """ Publish playbook starts and stops to fedmsg. """ playbook_path = None diff --git a/callback_plugins/logdetail.py b/callback_plugins/logdetail.py index fc328a0482..5954488e9e 100644 --- a/callback_plugins/logdetail.py +++ b/callback_plugins/logdetail.py @@ -21,6 +21,12 @@ import json import pwd from ansible import utils +try: + from ansible.plugins.callback import CallbackBase +except ImportError: + # Ansible v1 compat + CallbackBase = object + TIME_FORMAT="%b %d %Y %H:%M:%S" MSG_FORMAT="%(now)s\t%(count)s\t%(category)s\t%(name)s\t%(data)s\n" @@ -152,7 +158,7 @@ class LogMech(object): logmech = LogMech() -class CallbackModule(object): +class CallbackModule(CallbackBase): """ logs playbook results, per host, in /var/log/ansible/hosts """