diff options
| author | Toshio くらとみ <toshio@batcave01.phx2.fedoraproject.org> | 2016-01-30 06:18:12 +0000 |
|---|---|---|
| committer | Toshio くらとみ <toshio@batcave01.phx2.fedoraproject.org> | 2016-01-30 06:18:12 +0000 |
| commit | 617b679ab9c3f1072ac08a20952c32ddeb3e37cf (patch) | |
| tree | ddbc254ad2767a3bb37a6be49d428b2d53be9e33 /callback_plugins | |
| parent | ef791c04389a00b16ef5a01cd8a49e7567e555a9 (diff) | |
| download | ansible-617b679ab9c3f1072ac08a20952c32ddeb3e37cf.tar.gz ansible-617b679ab9c3f1072ac08a20952c32ddeb3e37cf.tar.xz ansible-617b679ab9c3f1072ac08a20952c32ddeb3e37cf.zip | |
Think I've found the variablemanager now
Diffstat (limited to 'callback_plugins')
| -rw-r--r-- | callback_plugins/fedmsg_callback2.py | 13 | ||||
| -rw-r--r-- | callback_plugins/logdetail2.py | 4 |
2 files changed, 4 insertions, 13 deletions
diff --git a/callback_plugins/fedmsg_callback2.py b/callback_plugins/fedmsg_callback2.py index f98881333..e6fb77659 100644 --- a/callback_plugins/fedmsg_callback2.py +++ b/callback_plugins/fedmsg_callback2.py @@ -79,15 +79,6 @@ 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(self.play_context.vars) - import q ; q.q(type(self.play_context.vars)) - import q ; q.q(dir(self.play_context.vars)) - import q ; q.q(play) - import q ; q.q(type(play)) - import q ; q.q(dir(play)) if self.playbook: # figure out where the playbook FILE is path = os.path.abspath(self.playbook._file_name) @@ -102,8 +93,8 @@ class CallbackModule(CallbackBase): msg=dict( playbook=path, userid=getlogin(), - #extra_vars=play.vars.extra_vars, - #inventory=play.vars._inventory.src(), + extra_vars=play._variable_manager.extra_vars, + inventory=play._variable_manager._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 f3e87e062..e264143e9 100644 --- a/callback_plugins/logdetail2.py +++ b/callback_plugins/logdetail2.py @@ -244,8 +244,8 @@ class CallbackModule(CallbackBase): pb_info['playbook_start'] = time.time() pb_info['playbook'] = path pb_info['userid'] = getlogin() - pb_info['extra_vars'] = play.vars.extra_vars - pb_info['inventory'] = play.vars._inventory.src() + pb_info['extra_vars'] = play._variable_manager.extra_vars + pb_info['inventory'] = play._variable_manager._inventory.src() pb_info['playbook_checksum'] = secure_hash(path) pb_info['check'] = self.play_context.check_mode pb_info['diff'] = self.play_context.diff |