mirror of
https://pagure.io/fedora-infra/ansible.git
synced 2026-05-16 13:56:03 +08:00
Make callbacks ansible 2.0 compatible
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user