adhoc: Load callbacks before sending v2_playbook_on_start (#67673)

pull/67756/head
flowerysong 4 years ago committed by GitHub
parent 4c016e64dd
commit 370f788731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- ansible command now correctly sends v2_playbook_on_start to callbacks

@ -160,6 +160,7 @@ class AdHocCLI(CLI):
forks=context.CLIARGS['forks'],
)
self._tqm.load_callbacks()
self._tqm.send_callback('v2_playbook_on_start', playbook)
result = self._tqm.run(play)

@ -12,5 +12,5 @@
- assert:
that:
- "adexec1_json.rc == 0"
- "adexec1_json.events|length == 3"
- "adexec1_json.events|length == 4"
- "'localhost' in adexec1_json.stats.ok"

@ -0,0 +1,12 @@
v2_playbook_on_start
v2_on_any
v2_playbook_on_play_start
v2_on_any
v2_playbook_on_task_start
v2_on_any
v2_runner_on_start
v2_on_any
v2_runner_on_ok
v2_on_any
v2_playbook_on_stats
v2_on_any

@ -0,0 +1,24 @@
# (c) 2020 Ansible Project
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from ansible.plugins.callback import CallbackBase
class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'stdout'
CALLBACK_NAME = 'callback_debug'
def __init__(self, *args, **kwargs):
super(CallbackModule, self).__init__(*args, **kwargs)
self._display.display('__init__')
for cb in [x for x in dir(CallbackBase) if x.startswith('v2_')]:
delattr(CallbackBase, cb)
def __getattr__(self, name):
if name.startswith('v2_'):
return(lambda *args, **kwargs: self._display.display(name))

@ -27,6 +27,9 @@ ansible localhost -m debug -a var=playbook_dir --playbook-dir=/tmp | grep '"play
# test setting playbook dir via ansible.cfg
env -u ANSIBLE_PLAYBOOK_DIR ANSIBLE_CONFIG=./playbookdir_cfg.ini ansible localhost -m debug -a var=playbook_dir | grep '"playbook_dir": "/tmp"'
# test adhoc callback triggers
ANSIBLE_STDOUT_CALLBACK=callback_debug ANSIBLE_LOAD_CALLBACK_PLUGINS=1 ansible --playbook-dir . testhost -i ../../inventory -m ping | grep -E '^v2_' | diff -u adhoc-callback.stdout -
# Test that no tmp dirs are left behind when running ansible-config
TMP_DIR=~/.ansible/tmptest
if [[ -d "$TMP_DIR" ]]; then

Loading…
Cancel
Save