Fix off-by-one error with retries

Fixes #16408 (cherry picked from commit 948682dbe2)
2016-06-23 18:07:11 -05:00 · 2016-06-23 18:07:11 -05:00 · 084a3e13b0
commit 084a3e13b0
parent eeba5e2c3e
1 changed files with 3 additions and 1 deletions
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@ -424,9 +424,11 @@ class TaskExecutor:

        # Read some values from the task, so that we can modify them if need be
        if self._task.until:
-            retries = self._task.retries
+            retries = self._task.retries + 1
            if retries is None:
                retries = 3
+            elif retries <= 0:
+                retries = 1
        else:
            retries = 1