diff options
| author | Sam Doran <sdoran@redhat.com> | 2020-06-24 15:36:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 15:36:51 -0400 |
| commit | a3c1ea886ffd2115ea2475d5342fc8d015790643 (patch) | |
| tree | cd6a74666b0499a7b03f537d557e6e98f4e606f5 /lib/ansible/plugins/action/__init__.py | |
| parent | 2531d548800d916b13ebecf4d5ebc63d50cff949 (diff) | |
| download | ansible-a3c1ea886ffd2115ea2475d5342fc8d015790643.tar.gz | |
Revert commits related to delegated facts changes (#70272)
* Revert "Fix storing delegate_to facts (#70231)"
This reverts commit 88bb76f248833ea0761fc474ba77ef697c62baac.
* Revert "Fix storing local task_vars facts for the retry (#70171)"
This reverts commit eaf6086eeab3ffc0389694a037c776cd3d6ac0b5.
Diffstat (limited to 'lib/ansible/plugins/action/__init__.py')
| -rw-r--r-- | lib/ansible/plugins/action/__init__.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index f1e0a14bca..83c7715d3e 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -160,7 +160,7 @@ class ActionBase(with_metaclass(ABCMeta, object)): ''' if task_vars is None: - task_vars = {} + use_vars = dict() if self._task.delegate_to: use_vars = task_vars.get('ansible_delegated_vars')[self._task.delegate_to] @@ -242,22 +242,18 @@ class ActionBase(with_metaclass(ABCMeta, object)): # we'll propagate back to the controller in the task result discovered_key = 'discovered_interpreter_%s' % idre.interpreter_name - # update the local vars copy for the retry - if use_vars.get('ansible_facts') is None: - use_vars['ansible_facts'] = {} - use_vars['ansible_facts'][discovered_key] = self._discovered_interpreter - # TODO: this condition prevents 'wrong host' from being updated # but in future we would want to be able to update 'delegated host facts' # irrespective of task settings if not self._task.delegate_to or self._task.delegate_facts: # store in local task_vars facts collection for the retry and any other usages in this worker - if task_vars.get('ansible_facts') is None: + if use_vars.get('ansible_facts') is None: task_vars['ansible_facts'] = {} task_vars['ansible_facts'][discovered_key] = self._discovered_interpreter # preserve this so _execute_module can propagate back to controller as a fact self._discovered_interpreter_key = discovered_key else: + task_vars['ansible_delegated_vars'][self._task.delegate_to] if task_vars['ansible_delegated_vars'][self._task.delegate_to].get('ansible_facts') is None: task_vars['ansible_delegated_vars'][self._task.delegate_to]['ansible_facts'] = {} task_vars['ansible_delegated_vars'][self._task.delegate_to]['ansible_facts'][discovered_key] = self._discovered_interpreter |