cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Save delegated vars in result for use in callback methods

Browse source 
Fixes #13014
This commit is contained in:
James Cammarata 2015-11-10 10:14:30 -05:00
parent e56fd9e95d
commit a99f2fd52f
2 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/executor/task_executor.py
View file

@ -461,6 +461,17 @@ class TaskExecutor:
if self._task.notify is not None: if self._task.notify is not None:
result['_ansible_notify'] = self._task.notify result['_ansible_notify'] = self._task.notify
# add the delegated vars to the result, so we can reference them
# on the results side without having to do any further templating
# FIXME: we only want a limited set of variables here, so this is currently
# hardcoded but should be possibly fixed if we want more or if
# there is another source of truth we can use
delegated_vars = variables.get('ansible_delegated_vars', dict()).get(self._task.delegate_to, dict()).copy()
if len(delegated_vars) > 0:
result["_ansible_delegated_vars"] = dict()
for k in ('ansible_host', ):
result["_ansible_delegated_vars"][k] = delegated_vars.get(k)
# preserve no_log setting # preserve no_log setting
result["_ansible_no_log"] = self._play_context.no_log result["_ansible_no_log"] = self._play_context.no_log

37
lib/ansible/plugins/callback/default.py
View file

@ -34,6 +34,7 @@ class CallbackModule(CallbackBase):
CALLBACK_NAME = 'default' CALLBACK_NAME = 'default'
def v2_runner_on_failed(self, result, ignore_errors=False): def v2_runner_on_failed(self, result, ignore_errors=False):
delegated_vars = result._result.get('_ansible_delegated_vars', None)
if 'exception' in result._result: if 'exception' in result._result:
if self._display.verbosity < 3: if self._display.verbosity < 3:
# extract just the actual error message from the exception text # extract just the actual error message from the exception text
@ -50,8 +51,8 @@ class CallbackModule(CallbackBase):
if result._task.loop and 'results' in result._result: if result._task.loop and 'results' in result._result:
self._process_items(result) self._process_items(result)
else: else:
if result._task.delegate_to: if delegated_vars:
self._display.display("fatal: [%s -> %s]: FAILED! => %s" % (result._host.get_name(), result._task.delegate_to, self._dump_results(result._result)), color='red') self._display.display("fatal: [%s -> %s]: FAILED! => %s" % (result._host.get_name(), delegated_vars['ansible_host'], self._dump_results(result._result)), color='red')
else: else:
self._display.display("fatal: [%s]: FAILED! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red') self._display.display("fatal: [%s]: FAILED! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red')
@ -60,17 +61,18 @@ class CallbackModule(CallbackBase):
def v2_runner_on_ok(self, result): def v2_runner_on_ok(self, result):
delegated_vars = result._result.get('_ansible_delegated_vars', None)
if result._task.action == 'include': if result._task.action == 'include':
return return
elif result._result.get('changed', False): elif result._result.get('changed', False):
if result._task.delegate_to is not None: if delegated_vars:
msg = "changed: [%s -> %s]" % (result._host.get_name(), result._task.delegate_to) msg = "changed: [%s -> %s]" % (result._host.get_name(), delegated_vars['ansible_host'])
else: else:
msg = "changed: [%s]" % result._host.get_name() msg = "changed: [%s]" % result._host.get_name()
color = 'yellow' color = 'yellow'
else: else:
if result._task.delegate_to is not None: if delegated_vars:
msg = "ok: [%s -> %s]" % (result._host.get_name(), result._task.delegate_to) msg = "ok: [%s -> %s]" % (result._host.get_name(), delegated_vars['ansible_host'])
else: else:
msg = "ok: [%s]" % result._host.get_name() msg = "ok: [%s]" % result._host.get_name()
color = 'green' color = 'green'
@ -96,8 +98,9 @@ class CallbackModule(CallbackBase):
self._display.display(msg, color='cyan') self._display.display(msg, color='cyan')
def v2_runner_on_unreachable(self, result): def v2_runner_on_unreachable(self, result):
if result._task.delegate_to: delegated_vars = result._result.get('_ansible_delegated_vars', None)
self._display.display("fatal: [%s -> %s]: UNREACHABLE! => %s" % (result._host.get_name(), result._task.delegate_to, self._dump_results(result._result)), color='red') if delegated_vars:
self._display.display("fatal: [%s -> %s]: UNREACHABLE! => %s" % (result._host.get_name(), delegated_vars['ansible_host'], self._dump_results(result._result)), color='red')
else: else:
self._display.display("fatal: [%s]: UNREACHABLE! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red') self._display.display("fatal: [%s]: UNREACHABLE! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red')
@ -135,13 +138,20 @@ class CallbackModule(CallbackBase):
def v2_playbook_item_on_ok(self, result): def v2_playbook_item_on_ok(self, result):
delegated_vars = result._result.get('_ansible_delegated_vars', None)
if result._task.action == 'include': if result._task.action == 'include':
return return
elif result._result.get('changed', False): elif result._result.get('changed', False):
msg = "changed: [%s]" % result._host.get_name() if delegated_vars:
msg = "changed: [%s -> %s]" % (result._host.get_name(), delegated_vars['ansible_host'])
else:
msg = "changed: [%s]" % result._host.get_name()
color = 'yellow' color = 'yellow'
else: else:
msg = "ok: [%s]" % result._host.get_name() if delegated_vars:
msg = "ok: [%s -> %s]" % (result._host.get_name(), delegated_vars['ansible_host'])
else:
msg = "ok: [%s]" % result._host.get_name()
color = 'green' color = 'green'
msg += " => (item=%s)" % (result._result['item'],) msg += " => (item=%s)" % (result._result['item'],)
@ -151,6 +161,7 @@ class CallbackModule(CallbackBase):
self._display.display(msg, color=color) self._display.display(msg, color=color)
def v2_playbook_item_on_failed(self, result): def v2_playbook_item_on_failed(self, result):
delegated_vars = result._result.get('_ansible_delegated_vars', None)
if 'exception' in result._result: if 'exception' in result._result:
if self._display.verbosity < 3: if self._display.verbosity < 3:
# extract just the actual error message from the exception text # extract just the actual error message from the exception text
@ -164,7 +175,11 @@ class CallbackModule(CallbackBase):
# finally, remove the exception from the result so it's not shown every time # finally, remove the exception from the result so it's not shown every time
del result._result['exception'] del result._result['exception']
self._display.display("failed: [%s] => (item=%s) => %s" % (result._host.get_name(), result._result['item'], self._dump_results(result._result)), color='red') if delegated_vars:
self._display.display("failed: [%s -> %s] => (item=%s) => %s" % (result._host.get_name(), delegated_vars['ansible_host'], result._result['item'], self._dump_results(result._result)), color='red')
else:
self._display.display("failed: [%s] => (item=%s) => %s" % (result._host.get_name(), result._result['item'], self._dump_results(result._result)), color='red')
self._handle_warnings(result._result) self._handle_warnings(result._result)
def v2_playbook_item_on_skipped(self, result): def v2_playbook_item_on_skipped(self, result):