diff options
| author | Toshio くらとみ <toshio@batcave01.phx2.fedoraproject.org> | 2016-01-30 06:04:49 +0000 |
|---|---|---|
| committer | Toshio くらとみ <toshio@batcave01.phx2.fedoraproject.org> | 2016-01-30 06:04:49 +0000 |
| commit | 89eec9b7afe5a0c94361e6cd13fc7c2a3d820ec9 (patch) | |
| tree | 8a00c3289531bdfb6a1c883588b32b6703faa7ec /callback_plugins | |
| parent | 242b04b4fe2d1fae3f67d84e05bff7c405ccef02 (diff) | |
| download | ansible-89eec9b7afe5a0c94361e6cd13fc7c2a3d820ec9.tar.gz ansible-89eec9b7afe5a0c94361e6cd13fc7c2a3d820ec9.tar.xz ansible-89eec9b7afe5a0c94361e6cd13fc7c2a3d820ec9.zip | |
Some more attribute fixups
Diffstat (limited to 'callback_plugins')
| -rw-r--r-- | callback_plugins/fedmsg_callback2.py | 10 | ||||
| -rw-r--r-- | callback_plugins/logdetail2.py | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/callback_plugins/fedmsg_callback2.py b/callback_plugins/fedmsg_callback2.py index a2399d041..964d80597 100644 --- a/callback_plugins/fedmsg_callback2.py +++ b/callback_plugins/fedmsg_callback2.py @@ -79,6 +79,12 @@ class CallbackModule(CallbackBase): def v2_playbook_on_play_start(self, play): # This gets called once for each play.. but we just issue a message once # for the first one. One per "playbook" + import q ; q.q(self.play_context) + import q ; q.q(type(self.play_context)) + import q ; q.q(dir(self.play_context)) + import q ; q.q(play.vars) + import q ; q.q(type(play.vars)) + import q ; q.q(dir(play.vars)) if self.playbook: # figure out where the playbook FILE is path = os.path.abspath(self.playbook._file_name) @@ -93,8 +99,8 @@ class CallbackModule(CallbackBase): msg=dict( playbook=path, userid=getlogin(), - extra_vars=play.vars.extra_vars, - inventory=play.vars._inventory.src(), + #extra_vars=play.vars.extra_vars, + #inventory=play.vars._inventory.src(), playbook_checksum=secure_hash(path), check=self.play_context.check_mode, ), diff --git a/callback_plugins/logdetail2.py b/callback_plugins/logdetail2.py index 4de702232..f3e87e062 100644 --- a/callback_plugins/logdetail2.py +++ b/callback_plugins/logdetail2.py @@ -98,8 +98,8 @@ class LogMech(object): def task_to_json(self, task): res = {} res['task_name'] = task.name - res['task_module'] = task.module_name - res['task_args'] = task.module_args + res['task_module'] = task.action + res['task_args'] = task.args if self.playbook_id == 'ansible-cmd': res['task_userid'] = getlogin() for k in ("delegate_to", "environment", "with_first_found", |