mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-04 23:44:00 -07:00
Pass vars from import_playbook in early (#39521)
* Pass vars from import_playbook in early, as they may be needed to parse the imported plays. Fixes #33693 * Add test for import_playbook vars
This commit is contained in:
parent
269d682f70
commit
cca96b8c9d
7 changed files with 20 additions and 6 deletions
|
@ -486,9 +486,9 @@ class Base(with_metaclass(BaseMeta, object)):
|
|||
try:
|
||||
if isinstance(ds, dict):
|
||||
_validate_variable_keys(ds)
|
||||
return ds
|
||||
return combine_vars(self.vars, ds)
|
||||
elif isinstance(ds, list):
|
||||
all_vars = dict()
|
||||
all_vars = self.vars
|
||||
for item in ds:
|
||||
if not isinstance(item, dict):
|
||||
raise ValueError
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue