From 5c38d43ce37073474298ad07b0a0900c8f49c938 Mon Sep 17 00:00:00 2001 From: Thomas Woerner <twoerner@redhat.com> Date: Tue, 7 Sep 2021 11:20:42 +0200 Subject: [PATCH] utils/templates/ipamodul.py.ine: Use execute_ipa_commands execute_ipa_commands replces the check mode exit, the loop over the generated commands and also in the member failure handling for modules with member support. --- utils/templates/ipamodule.py.in | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/utils/templates/ipamodule.py.in b/utils/templates/ipamodule.py.in index f7d1e538..b179a0b8 100644 --- a/utils/templates/ipamodule.py.in +++ b/utils/templates/ipamodule.py.in @@ -194,23 +194,9 @@ def main(): else: ansible_module.fail_json(msg="Unkown state '%s'" % state) - # Check mode exit - if ansible_module.check_mode: - ansible_module.exit_json(changed=len(commands) > 0, **exit_args) - # Execute commands - for name, command, args in commands: - try: - result = ansible_module.ipa_command(command, name, args) - if "completed" in result: - if result["completed"] > 0: - changed = True - else: - changed = True - except Exception as e: - ansible_module.fail_json(msg="%s: %s: %s" % (command, name, - str(e))) + changed = ansible_module.execute_ipa_commands(commands) # Done -- GitLab