Skip to content

A
ansible
Commit 2c6baf68 by James Cammarata
Options

Merge branch 'devel-duplicates' of https://github.com/smoothify/ansible into… 

Merge branch 'devel-duplicates' of https://github.com/smoothify/ansible into smoothify-devel-duplicates
parents 82ed1b8d 0411ea28
Showing with 2 additions and 0 deletions
lib/ansible/playbook/play.py
...@@ -194,6 +194,8 @@ class Play(object): ...@@ -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')))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment