cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ensure duplicate roles are not loaded in the case of a missing meta/main.yml file.

Browse source
This commit is contained in:
smoothify 2013-09-04 12:38:42 +01:00
parent 4eedfa46a2
commit 0411ea2867
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/play.py
View file

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