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

Fix invocation from bad merge and note where it would need to go to keep

Browse source 
it out of registered vars as well.
This commit is contained in:
Toshio Kuratomi 2015-10-24 07:28:02 -07:00
parent 25e3fe04a8
commit 92dd563a75
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -365,7 +365,7 @@ class TaskExecutor:
# update the local copy of vars with the registered value, if specified,
# or any facts which may have been generated by the module execution
if self._task.register:
vars_copy[self._task.register] = result
vars_copy[self._task.register] = result
if 'ansible_facts' in result:
vars_copy.update(result['ansible_facts'])
@ -412,6 +412,12 @@ class TaskExecutor:
# do the final update of the local variables here, for both registered
# values and any facts which may have been created
if self._task.register:
### FIXME:
# If we remove invocation, we should also be removing _ansible*
# and maybe ansible_facts.
# Remove invocation from registered vars
#if 'invocation' in result:
# del result['invocation']
variables[self._task.register] = result
if 'ansible_facts' in result:

5
lib/ansible/plugins/callback/__init__.py
View file

@ -68,11 +68,8 @@ class CallbackBase:
keep_invocation = False
else:
keep_invocation = True
if not keep_invocation and 'invocation' in result:
del abridged_result['invocation']
# remove invocation info unless its very very verbose
if 'invocation' in abridged_result and self._display.verbosity < 3:
if not keep_invocation and 'invocation' in result:
del abridged_result['invocation']
return json.dumps(abridged_result, indent=indent, ensure_ascii=False, sort_keys=sort_keys)