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:
Matt Martz 2018-04-30 16:13:43 -05:00 committed by GitHub
commit cca96b8c9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 6 deletions

View file

@ -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