mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-06-27 10:40:22 -07:00
Merge pull request #13626 from bcoca/hostvars_vars
move hostvars.vars to vars
This commit is contained in:
commit
84f46701d0
1 changed files with 2 additions and 2 deletions
|
@ -259,8 +259,6 @@ class VariableManager:
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
all_vars['vars'] = all_vars.copy()
|
|
||||||
|
|
||||||
if play:
|
if play:
|
||||||
all_vars = combine_vars(all_vars, play.get_vars())
|
all_vars = combine_vars(all_vars, play.get_vars())
|
||||||
|
|
||||||
|
@ -343,6 +341,8 @@ class VariableManager:
|
||||||
all_vars['ansible_delegated_vars'] = self._get_delegated_vars(loader, play, task, all_vars)
|
all_vars['ansible_delegated_vars'] = self._get_delegated_vars(loader, play, task, all_vars)
|
||||||
|
|
||||||
#VARIABLE_CACHE[cache_entry] = all_vars
|
#VARIABLE_CACHE[cache_entry] = all_vars
|
||||||
|
if task or play:
|
||||||
|
all_vars['vars'] = all_vars.copy()
|
||||||
|
|
||||||
debug("done with get_vars()")
|
debug("done with get_vars()")
|
||||||
return all_vars
|
return all_vars
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue