simpler loop_control defaults (ansible#34008)

olivergondza · Dec 20, 2017 · 8c6d823 · 8c6d823
1 parent 76590ab
commit 8c6d823
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
@@ -254,10 +254,10 @@ def _run_loop(self, items):
         label = None
         loop_pause = 0
         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 or 'item'
+            loop_var = self._task.loop_control.loop_var
+            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 + '}}')
-            loop_pause = self._task.loop_control.pause or 0
 
         if loop_var in task_vars:
             display.warning(u"The loop variable '%s' is already in use. "

diff --git a/lib/ansible/playbook/included_file.py b/lib/ansible/playbook/included_file.py
@@ -85,7 +85,7 @@ def get_original_host(host):
                     include_variables = include_result.get('include_variables', dict())
                     loop_var = 'item'
                     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:
                         task_vars[loop_var] = include_variables[loop_var] = include_result[loop_var]
 

diff --git a/lib/ansible/playbook/loop_control.py b/lib/ansible/playbook/loop_control.py
@@ -25,9 +25,9 @@
 
 class LoopControl(Base):
 
-    _loop_var = FieldAttribute(isa='str')
+    _loop_var = FieldAttribute(isa='str', default='item')
     _label = FieldAttribute(isa='str')
-    _pause = FieldAttribute(isa='int')
+    _pause = FieldAttribute(isa='int', default=0)
 
     def __init__(self):
         super(LoopControl, self).__init__()

diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py
@@ -358,7 +358,7 @@ def parent_handler_match(target_handler, handler_name):
 
             # get the correct loop var for use later
             if original_task.loop_control:
-                loop_var = original_task.loop_control.loop_var or 'item'
+                loop_var = original_task.loop_control.loop_var
             else:
                 loop_var = 'item'