Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Some more attribute fixups

Browse source
This commit is contained in:
Toshio くらとみ 2016-01-30 06:04:49 +00:00
parent 242b04b4fe
commit 89eec9b7af
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
callback_plugins/fedmsg_callback2.py
View file

@ -79,6 +79,12 @@ class CallbackModule(CallbackBase):
def v2_playbook_on_play_start(self, play): def v2_playbook_on_play_start(self, play):
# This gets called once for each play.. but we just issue a message once # This gets called once for each play.. but we just issue a message once
# for the first one. One per "playbook" # 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: if self.playbook:
# figure out where the playbook FILE is # figure out where the playbook FILE is
path = os.path.abspath(self.playbook._file_name) path = os.path.abspath(self.playbook._file_name)
@ -93,8 +99,8 @@ class CallbackModule(CallbackBase):
msg=dict( msg=dict(
playbook=path, playbook=path,
userid=getlogin(), userid=getlogin(),
extra_vars=play.vars.extra_vars, #extra_vars=play.vars.extra_vars,
inventory=play.vars._inventory.src(), #inventory=play.vars._inventory.src(),
playbook_checksum=secure_hash(path), playbook_checksum=secure_hash(path),
check=self.play_context.check_mode, check=self.play_context.check_mode,
), ),

4
callback_plugins/logdetail2.py
View file

@ -98,8 +98,8 @@ class LogMech(object):
def task_to_json(self, task): def task_to_json(self, task):
res = {} res = {}
res['task_name'] = task.name res['task_name'] = task.name
res['task_module'] = task.module_name res['task_module'] = task.action
res['task_args'] = task.module_args res['task_args'] = task.args
if self.playbook_id == 'ansible-cmd': if self.playbook_id == 'ansible-cmd':
res['task_userid'] = getlogin() res['task_userid'] = getlogin()
for k in ("delegate_to", "environment", "with_first_found", for k in ("delegate_to", "environment", "with_first_found",