ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Move post_validate for tasks after checking for an include

Browse source 
Simplifies logic and prevents us from accidentally post_validating
an include that would otherwise be skipped due to tags causing a
problem because of potentially missing variables.

Fixes #12793
This commit is contained in:
James Cammarata 2015-10-19 13:40:47 -04:00
parent 1cfd941179
commit 892d9b8dfb
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/executor/task_executor.py
View file

@ -279,6 +279,16 @@ class TaskExecutor:
self._display.debug("when evaulation failed, skipping this task") self._display.debug("when evaulation failed, skipping this task")
return dict(changed=False, skipped=True, skip_reason='Conditional check failed', _ansible_no_log=self._play_context.no_log) return dict(changed=False, skipped=True, skip_reason='Conditional check failed', _ansible_no_log=self._play_context.no_log)
# if this task is a TaskInclude, we just return now with a success code so the
# main thread can expand the task list for the given host
if self._task.action == 'include':
include_file = self._task.args.pop('_raw_params', None)
if not include_file:
return dict(failed=True, msg="No include file was specified to the include")
else:
include_file = templar.template(include_file)
return dict(include=include_file, include_variables=self._task.args)
# Now we do final validation on the task, which sets all fields to their final values. # Now we do final validation on the task, which sets all fields to their final values.
# In the case of debug tasks, we save any 'var' params and restore them after validating # In the case of debug tasks, we save any 'var' params and restore them after validating
# so that variables are not replaced too early. # so that variables are not replaced too early.
@ -286,7 +296,6 @@ class TaskExecutor:
if self._task.action == 'debug' and 'var' in self._task.args: if self._task.action == 'debug' and 'var' in self._task.args:
prev_var = self._task.args.pop('var') prev_var = self._task.args.pop('var')
original_args = self._task.args.copy()
self._task.post_validate(templar=templar) self._task.post_validate(templar=templar)
if '_variable_params' in self._task.args: if '_variable_params' in self._task.args:
variable_params = self._task.args.pop('_variable_params') variable_params = self._task.args.pop('_variable_params')
@ -298,14 +307,6 @@ class TaskExecutor:
if prev_var is not None: if prev_var is not None:
self._task.args['var'] = prev_var self._task.args['var'] = prev_var
# if this task is a TaskInclude, we just return now with a success code so the
# main thread can expand the task list for the given host
if self._task.action == 'include':
include_variables = original_args
include_file = include_variables.get('_raw_params')
del include_variables['_raw_params']
return dict(include=include_file, include_variables=include_variables)
# get the connection and the handler for this execution # get the connection and the handler for this execution
self._connection = self._get_connection(variables=variables, templar=templar) self._connection = self._get_connection(variables=variables, templar=templar)
self._connection.set_host_overrides(host=self._host) self._connection.set_host_overrides(host=self._host)

1
lib/ansible/plugins/strategy/__init__.py
View file

@ -401,6 +401,7 @@ class StrategyBase:
try: try:
data = self._loader.load_from_file(included_file._filename) data = self._loader.load_from_file(included_file._filename)
self._tqm.send_callback('v2_playbook_on_include', included_file)
if data is None: if data is None:
return [] return []
except AnsibleError as e: except AnsibleError as e: