Make callbacks ansible 2.0 compatible

This commit is contained in:
Toshio くらとみ 2016-01-29 06:02:10 +00:00
parent 1c4afb6470
commit 379afc6db5
2 changed files with 13 additions and 2 deletions

View file

@ -22,6 +22,11 @@ import pwd
import fedmsg import fedmsg
import fedmsg.config import fedmsg.config
try:
from ansible.plugins.callback import CallbackBase
except ImportError:
# Ansible v1 compat
CallbackBase = object
def getlogin(): def getlogin():
try: try:
@ -31,7 +36,7 @@ def getlogin():
return user return user
class CallbackModule(object): class CallbackModule(CallbackBase):
""" Publish playbook starts and stops to fedmsg. """ """ Publish playbook starts and stops to fedmsg. """
playbook_path = None playbook_path = None

View file

@ -21,6 +21,12 @@ import json
import pwd import pwd
from ansible import utils 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" 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" 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() logmech = LogMech()
class CallbackModule(object): class CallbackModule(CallbackBase):
""" """
logs playbook results, per host, in /var/log/ansible/hosts logs playbook results, per host, in /var/log/ansible/hosts
""" """