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

Properly fail out of the task loop in the linear strategy on failures (v2)

Browse source
This commit is contained in:
James Cammarata 2015-05-05 13:41:32 -05:00
parent fba5588028
commit 8fae2abed4
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/executor/playbook_executor.py
View file

@ -117,15 +117,17 @@ class PlaybookExecutor:
if len(batch) == 0:
self._tqm.send_callback('v2_playbook_on_play_start', new_play)
self._tqm.send_callback('v2_playbook_on_no_hosts_matched')
result = 0
result = 1
break
# restrict the inventory to the hosts in the serialized batch
self._inventory.restrict_to_hosts(batch)
# and run it...
result = self._tqm.run(play=play)
# if the last result wasn't zero, break out of the serial batch loop
if result != 0:
break
# if the last result wasn't zero, break out of the play loop
if result != 0:
break
@ -134,6 +136,10 @@ class PlaybookExecutor:
if entry:
entrylist.append(entry) # per playbook
# if the last result wasn't zero, break out of the playbook file name loop
if result != 0:
break
if entrylist:
return entrylist

3
lib/ansible/plugins/strategies/linear.py
View file

@ -226,6 +226,9 @@ class StrategyModule(StrategyBase):
# FIXME: this should also be moved to the base class in a method
included_files = []
for res in host_results:
if res.is_failed():
return 1
if res._task.action == 'include':
if res._task.loop:
include_results = res._result['results']

9
samples/test_play_failure.yml Normal file
View file

@ -0,0 +1,9 @@
- hosts: localhost
gather_facts: no
tasks:
- fail:
- hosts: localhost
gather_facts: no
tasks:
- debug: msg="you should not see me..."