From aee1d42fe72aaabdceaed847cfa8408baa62e48b Mon Sep 17 00:00:00 2001 From: Ganesh Nalawade Date: Fri, 27 Jul 2018 20:36:15 +0530 Subject: [PATCH] Correcting conditionals looping (#43331) (#43346) * Correcting conditionals looping (#43331) Empty conditionals would not break out of the loop, causing every command to be run for the same number of times as retries is defined (10 by default) (cherry picked from commit e215f842bab59b15bfbe64dd5409cc1d4a27dbd5) * Update changelog --- changelogs/fragments/vyos_command_retry.yml | 2 ++ lib/ansible/modules/network/vyos/vyos_command.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/vyos_command_retry.yml diff --git a/changelogs/fragments/vyos_command_retry.yml b/changelogs/fragments/vyos_command_retry.yml new file mode 100644 index 00000000000..4e0fd8235aa --- /dev/null +++ b/changelogs/fragments/vyos_command_retry.yml @@ -0,0 +1,2 @@ +bugfixes: +- vyos_command correcting conditionals looping (https://github.com/ansible/ansible/pull/43331). diff --git a/lib/ansible/modules/network/vyos/vyos_command.py b/lib/ansible/modules/network/vyos/vyos_command.py index 4f13acff8c6..80f89666802 100644 --- a/lib/ansible/modules/network/vyos/vyos_command.py +++ b/lib/ansible/modules/network/vyos/vyos_command.py @@ -212,10 +212,10 @@ def main(): break conditionals.remove(item) - if not conditionals: - break + if not conditionals: + break - time.sleep(interval) + time.sleep(interval) if conditionals: failed_conditions = [item.raw for item in conditionals]