mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge branch 'devel-duplicates' of https://github.com/smoothify/ansible into smoothify-devel-duplicates
This commit is contained in:
commit
2c6baf6845
1 changed files with 2 additions and 0 deletions
|
@ -194,6 +194,8 @@ class Play(object):
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
self.included_roles.append(dep)
|
self.included_roles.append(dep)
|
||||||
|
else:
|
||||||
|
continue
|
||||||
dep_vars = utils.combine_vars(passed_vars, dep_vars)
|
dep_vars = utils.combine_vars(passed_vars, dep_vars)
|
||||||
dep_vars = utils.combine_vars(role_vars, dep_vars)
|
dep_vars = utils.combine_vars(role_vars, dep_vars)
|
||||||
vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'vars')))
|
vars = self._resolve_main(utils.path_dwim(self.basedir, os.path.join(dep_path, 'vars')))
|
||||||
|
|
Loading…
Reference in a new issue