wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix free strategy only running first play in a multi-play playbook

Browse source 
Fixes #11839
This commit is contained in:
James Cammarata 2015-08-03 14:40:16 -04:00
parent c2435fab7e
commit ed603f7030
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/plugins/strategies/free.py
View file

@ -53,7 +53,7 @@ class StrategyModule(StrategyBase):
work_to_do = True
while work_to_do and not self._tqm._terminated:
hosts_left = self.get_hosts_remaining(iterator._play)
hosts_left = self._inventory.get_hosts(iterator._play.hosts)
if len(hosts_left) == 0:
self._tqm.send_callback('v2_playbook_on_no_hosts_remaining')
result = False
@ -149,10 +149,9 @@ class StrategyModule(StrategyBase):
except Exception as e:
# FIXME: ctrl+c can cause some failures here, so catch them
# with the appropriate error type
print("wtf: %s" % e)
pass
# run the base class run() method, which executes the cleanup function
# and runs any outstanding handlers which have been triggered
super(StrategyModule, self).run(iterator, play_context)
return super(StrategyModule, self).run(iterator, play_context, result)