ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-28 03:49:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

simpler loop_control defaults (#34008)

Browse source
This commit is contained in:
Brian Coca 2017-12-20 16:28:38 -05:00 • committed by Jordan Borean
parent 76590ab8a5
commit 8c6d823963
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,10 +254,10 @@ class TaskExecutor:
label = None label = None
loop_pause = 0 loop_pause = 0
if self._task.loop_control: if self._task.loop_control:
# the value may be 'None', so we still need to default it back to 'item' loop_var = self._task.loop_control.loop_var
loop_var = self._task.loop_control.loop_var or 'item' loop_pause = self._task.loop_control.pause
# the these may be 'None', so we still need to default to something useful
label = self._task.loop_control.label or ('{{' + loop_var + '}}') label = self._task.loop_control.label or ('{{' + loop_var + '}}')
loop_pause = self._task.loop_control.pause or 0
if loop_var in task_vars: if loop_var in task_vars:
display.warning(u"The loop variable '%s' is already in use. " display.warning(u"The loop variable '%s' is already in use. "

2
lib/ansible/playbook/included_file.py
View file

@ -85,7 +85,7 @@ class IncludedFile:
include_variables = include_result.get('include_variables', dict()) include_variables = include_result.get('include_variables', dict())
loop_var = 'item' loop_var = 'item'
if original_task.loop_control: if original_task.loop_control:
loop_var = original_task.loop_control.loop_var or 'item' loop_var = original_task.loop_control.loop_var
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]

4
lib/ansible/playbook/loop_control.py
View file

@ -25,9 +25,9 @@ from ansible.playbook.base import Base
class LoopControl(Base): class LoopControl(Base):
_loop_var = FieldAttribute(isa='str') _loop_var = FieldAttribute(isa='str', default='item')
_label = FieldAttribute(isa='str') _label = FieldAttribute(isa='str')
_pause = FieldAttribute(isa='int') _pause = FieldAttribute(isa='int', default=0)
def __init__(self): def __init__(self):
super(LoopControl, self).__init__() super(LoopControl, self).__init__()

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

@ -358,7 +358,7 @@ class StrategyBase:
# get the correct loop var for use later # get the correct loop var for use later
if original_task.loop_control: if original_task.loop_control:
loop_var = original_task.loop_control.loop_var or 'item' loop_var = original_task.loop_control.loop_var
else: else:
loop_var = 'item' loop_var = 'item'