Partial revert of 73c883c due to issues with handlers in roles

Fixes #6322
This commit is contained in:
James Cammarata 2014-03-06 21:11:57 -06:00
commit b6056044b7
3 changed files with 3 additions and 11 deletions

View file

@ -240,20 +240,13 @@ class PlayBook(object):
plays = []
matched_tags_all = set()
unmatched_tags_all = set()
included_roles = []
# loop through all patterns and run them
self.callbacks.on_start()
for (play_ds, play_basedir) in zip(self.playbook, self.play_basedirs):
play = Play(self, play_ds, play_basedir, included_roles=included_roles, vault_password=self.vault_password)
play = Play(self, play_ds, play_basedir, vault_password=self.vault_password)
assert play is not None
# add any new roles brought in by this play to the
# global list of roles we're tracking
for role in play.included_roles:
if role not in included_roles:
included_roles.append(role)
matched_tags, unmatched_tags = play.compare_tags(self.only_tags)
matched_tags_all = matched_tags_all | matched_tags
unmatched_tags_all = unmatched_tags_all | unmatched_tags