archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly create include_role blocks when using loops (#30372)

Browse Source 
Also fixes instances where conditionals or other variables may result in
hosts executing lists of tasks of differing sizes.

Fixes #18748
pull/30390/head
James Cammarata 7 years ago committed by GitHub
parent 173c41aefe
commit 6730f81024
3 changed files with 76 additions and 78 deletions
Show Stats Download Patch File Download Diff File

94
lib/ansible/playbook/included_file.py
Unescape Escape View File

@ -34,11 +34,12 @@ except ImportError:
class IncludedFile: class IncludedFile:
def __init__(self, filename, args, task): def __init__(self, filename, args, task, is_role=False):
self._filename = filename self._filename = filename
self._args = args self._args = args
self._task = task self._task = task
self._hosts = [] self._hosts = []
self._is_role = is_role
def add_host(self, host): def add_host(self, host):
if host not in self._hosts: if host not in self._hosts:
@ -65,7 +66,7 @@ class IncludedFile:
original_host = res._host original_host = res._host
original_task = res._task original_task = res._task
if original_task.action in ('include', 'include_tasks'): if original_task.action in ('include', 'include_tasks', 'include_role'):
if original_task.loop: if original_task.loop:
if 'results' not in res._result: if 'results' not in res._result:
continue continue
@ -75,7 +76,7 @@ class IncludedFile:
for include_result in include_results: for include_result in include_results:
# if the task result was skipped or failed, continue # if the task result was skipped or failed, continue
if 'skipped' in include_result and include_result['skipped'] or 'failed' in include_result: if 'skipped' in include_result and include_result['skipped'] or 'failed' in include_result and include_result['failed']:
continue continue
task_vars = variable_manager.get_vars(play=iterator._play, host=original_host, task=original_task) task_vars = variable_manager.get_vars(play=iterator._play, host=original_host, task=original_task)
@ -88,49 +89,52 @@ class IncludedFile:
if loop_var in include_result: if loop_var in include_result:
task_vars[loop_var] = include_variables[loop_var] = include_result[loop_var] task_vars[loop_var] = include_variables[loop_var] = include_result[loop_var]
include_file = None if original_task.action in ('include', 'include_tasks'):
if original_task: include_file = None
if original_task.static: if original_task:
continue if original_task.static:
continue
if original_task._parent:
# handle relative includes by walking up the list of parent include if original_task._parent:
# tasks and checking the relative result to see if it exists # handle relative includes by walking up the list of parent include
parent_include = original_task._parent # tasks and checking the relative result to see if it exists
cumulative_path = None parent_include = original_task._parent
while parent_include is not None: cumulative_path = None
if not isinstance(parent_include, TaskInclude): while parent_include is not None:
parent_include = parent_include._parent if not isinstance(parent_include, TaskInclude):
continue parent_include = parent_include._parent
if isinstance(parent_include, IncludeRole): continue
parent_include_dir = parent_include._role_path if isinstance(parent_include, IncludeRole):
else: parent_include_dir = parent_include._role_path
parent_include_dir = os.path.dirname(templar.template(parent_include.args.get('_raw_params'))) else:
if cumulative_path is not None and not os.path.isabs(cumulative_path): parent_include_dir = os.path.dirname(templar.template(parent_include.args.get('_raw_params')))
cumulative_path = os.path.join(parent_include_dir, cumulative_path) if cumulative_path is not None and not os.path.isabs(cumulative_path):
else: cumulative_path = os.path.join(parent_include_dir, cumulative_path)
cumulative_path = parent_include_dir else:
cumulative_path = parent_include_dir
include_target = templar.template(include_result['include'])
if original_task._role:
new_basedir = os.path.join(original_task._role._role_path, 'tasks', cumulative_path)
include_file = loader.path_dwim_relative(new_basedir, 'tasks', include_target)
else:
include_file = loader.path_dwim_relative(loader.get_basedir(), cumulative_path, include_target)
if os.path.exists(include_file):
break
else:
parent_include = parent_include._parent
if include_file is None:
if original_task._role:
include_target = templar.template(include_result['include']) include_target = templar.template(include_result['include'])
if original_task._role: include_file = loader.path_dwim_relative(original_task._role._role_path, 'tasks', include_target)
new_basedir = os.path.join(original_task._role._role_path, 'tasks', cumulative_path) else:
include_file = loader.path_dwim_relative(new_basedir, 'tasks', include_target) include_file = loader.path_dwim(include_result['include'])
else:
include_file = loader.path_dwim_relative(loader.get_basedir(), cumulative_path, include_target) include_file = templar.template(include_file)
inc_file = IncludedFile(include_file, include_variables, original_task)
if os.path.exists(include_file): else:
break inc_file = IncludedFile("role", include_variables, original_task, is_role=True)
else:
parent_include = parent_include._parent
if include_file is None:
if original_task._role:
include_target = templar.template(include_result['include'])
include_file = loader.path_dwim_relative(original_task._role._role_path, 'tasks', include_target)
else:
include_file = loader.path_dwim(include_result['include'])
include_file = templar.template(include_file)
inc_file = IncludedFile(include_file, include_variables, original_task)
try: try:
pos = included_files.index(inc_file) pos = included_files.index(inc_file)

13
lib/ansible/plugins/strategy/free.py
Unescape Escape View File

@ -193,7 +193,18 @@ class StrategyModule(StrategyBase):
for included_file in included_files: for included_file in included_files:
display.debug("collecting new blocks for %s" % included_file) display.debug("collecting new blocks for %s" % included_file)
try: try:
new_blocks = self._load_included_file(included_file, iterator=iterator) if included_file._is_role:
new_ir = included_file._task.copy()
new_ir.vars.update(included_file._args)
new_blocks, handler_blocks = new_ir.get_block_list(
play=iterator._play,
variable_manager=self._variable_manager,
loader=self._loader,
)
self._tqm.update_handler_list([handler for handler_block in handler_blocks for handler in handler_block.block])
else:
new_blocks = self._load_included_file(included_file, iterator=iterator)
except AnsibleError as e: except AnsibleError as e:
for host in included_file._hosts: for host in included_file._hosts:
iterator.mark_host_failed(host) iterator.mark_host_failed(host)

47
lib/ansible/plugins/strategy/linear.py
Unescape Escape View File

@ -290,38 +290,8 @@ class StrategyModule(StrategyBase):
display.debug("done queuing things up, now waiting for results queue to drain") display.debug("done queuing things up, now waiting for results queue to drain")
if self._pending_results > 0: if self._pending_results > 0:
results += self._wait_on_pending_results(iterator) results += self._wait_on_pending_results(iterator)
host_results.extend(results)
all_role_blocks = [] host_results.extend(results)
for hr in results:
# handle include_role
if hr._task.action == 'include_role':
loop_var = None
if hr._task.loop:
loop_var = 'item'
if hr._task.loop_control:
loop_var = hr._task.loop_control.loop_var or 'item'
include_results = hr._result.get('results', [])
else:
include_results = [hr._result]
for include_result in include_results:
if 'skipped' in include_result and include_result['skipped'] or 'failed' in include_result and include_result['failed']:
continue
display.debug("generating all_blocks data for role")
new_ir = hr._task.copy()
new_ir.vars.update(include_result.get('include_variables', dict()))
if loop_var and loop_var in include_result:
new_ir.vars[loop_var] = include_result[loop_var]
blocks, handler_blocks = new_ir.get_block_list(play=iterator._play, variable_manager=self._variable_manager, loader=self._loader)
all_role_blocks.extend(blocks)
self._tqm.update_handler_list([handler for handler_block in handler_blocks for handler in handler_block.block])
if len(all_role_blocks) > 0:
for host in hosts_left:
iterator.add_tasks(host, all_role_blocks)
try: try:
included_files = IncludedFile.process_include_results( included_files = IncludedFile.process_include_results(
@ -339,6 +309,8 @@ class StrategyModule(StrategyBase):
include_failure = False include_failure = False
if len(included_files) > 0: if len(included_files) > 0:
display.debug("we have included files to process") display.debug("we have included files to process")
# A noop task for use in padding dynamic includes
noop_task = Task() noop_task = Task()
noop_task.action = 'meta' noop_task.action = 'meta'
noop_task.args['_raw_params'] = 'noop' noop_task.args['_raw_params'] = 'noop'
@ -352,7 +324,18 @@ class StrategyModule(StrategyBase):
# included hosts get the task list while those excluded get an equal-length # included hosts get the task list while those excluded get an equal-length
# list of noop tasks, to make sure that they continue running in lock-step # list of noop tasks, to make sure that they continue running in lock-step
try: try:
new_blocks = self._load_included_file(included_file, iterator=iterator) if included_file._is_role:
new_ir = included_file._task.copy()
new_ir.vars.update(included_file._args)
new_blocks, handler_blocks = new_ir.get_block_list(
play=iterator._play,
variable_manager=self._variable_manager,
loader=self._loader,
)
self._tqm.update_handler_list([handler for handler_block in handler_blocks for handler in handler_block.block])
else:
new_blocks = self._load_included_file(included_file, iterator=iterator)
display.debug("iterating over new_blocks loaded from include file") display.debug("iterating over new_blocks loaded from include file")
for new_block in new_blocks: for new_block in new_blocks:

Write Preview
Loading…
Cancel
Save