internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't swallow exceptions when processing included files (#54791)

Browse Source 
* Don't swallow exceptions when processing included files. Fixes #54786
This commit is contained in:
Matt Martz
2019-04-08 11:03:22 -05:00
committed by Brian Coca
parent 17776142d1
commit 56ae8ebd60
4 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/ansible/plugins/strategy/__init__.py
View File

@@ -893,15 +893,12 @@ class StrategyBase:
# collect the results from the handler run
host_results = self._wait_on_handler_results(iterator, handler, notified_hosts)
try:
included_files = IncludedFile.process_include_results(
host_results,
iterator=iterator,
loader=self._loader,
variable_manager=self._variable_manager
)
except AnsibleError:
return False
included_files = IncludedFile.process_include_results(
host_results,
iterator=iterator,
loader=self._loader,
variable_manager=self._variable_manager
)
result = True
if len(included_files) > 0:

15
lib/ansible/plugins/strategy/free.py
View File

@@ -202,15 +202,12 @@ class StrategyModule(StrategyBase):
self.update_active_connections(results)
try:
included_files = IncludedFile.process_include_results(
host_results,
iterator=iterator,
loader=self._loader,
variable_manager=self._variable_manager
)
except AnsibleError as e:
return self._tqm.RUN_ERROR
included_files = IncludedFile.process_include_results(
host_results,
iterator=iterator,
loader=self._loader,
variable_manager=self._variable_manager
)
if len(included_files) > 0:
all_blocks = dict((host, []) for host in hosts_left)

16
lib/ansible/plugins/strategy/linear.py
View File

@@ -324,16 +324,12 @@ class StrategyModule(StrategyBase):
self.update_active_connections(results)
try:
included_files = IncludedFile.process_include_results(
host_results,
iterator=iterator,
loader=self._loader,
variable_manager=self._variable_manager
)
except AnsibleError as e:
# this is a fatal error, so we abort here regardless of block state
return self._tqm.RUN_ERROR
included_files = IncludedFile.process_include_results(
host_results,
iterator=iterator,
loader=self._loader,
variable_manager=self._variable_manager
)
include_failure = False
if len(included_files) > 0: