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

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

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: