Don't swallow exceptions when processing included files (#54791)
* Don't swallow exceptions when processing included files. Fixes #54786pull/4420/head
parent
17776142d1
commit
56ae8ebd60
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- include_role - Don't swallow errors when processing included files/roles (https://github.com/ansible/ansible/issues/54786)
|
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue