diff --git a/plugins/modules/ipaautomember.py b/plugins/modules/ipaautomember.py index 49c8d9a28170db8360296645740c1bef4056eca6..9a93cd23c1d8b662daa79d615b010ef35fad5fc0 100644 --- a/plugins/modules/ipaautomember.py +++ b/plugins/modules/ipaautomember.py @@ -390,32 +390,16 @@ def main(): commands.append([None, 'automember_rebuild', {"hosts": rebuild_hosts}]) - # Check mode exit - if ansible_module.check_mode: - ansible_module.exit_json(changed=len(commands) > 0, **exit_args) - - for name, command, args in commands: - try: - if name is None: - result = ansible_module.ipa_command_no_name(command, args) - else: - result = ansible_module.ipa_command(command, name, args) + # Execute commands - if "completed" in result: - if result["completed"] > 0: - changed = True - else: - changed = True - except Exception as ex: - ansible_module.fail_json(msg="%s: %s: %s" % (command, name, - str(ex))) - - # result["failed"] is used only for INCLUDE_RE, EXCLUDE_RE - # if entries could not be added that are already there and - # it entries could not be removed that are not there. - # All other issues like invalid attributes etc. are handled - # as exceptions. Therefore the error section is not here as - # in other modules. + changed = ansible_module.execute_ipa_commands(commands) + + # result["failed"] is used only for INCLUDE_RE, EXCLUDE_RE + # if entries could not be added that are already there and + # if entries could not be removed that are not there. + # All other issues like invalid attributes etc. are handled + # as exceptions. Therefore the error section is not here as + # in other modules. # Done ansible_module.exit_json(changed=changed, **exit_args)