Skip to content
Snippets Groups Projects
Commit e6f0eb23 authored by Thomas Woerner's avatar Thomas Woerner
Browse files

automember: 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.
parent 917b3b62
No related branches found
No related tags found
No related merge requests found
...@@ -390,32 +390,16 @@ def main(): ...@@ -390,32 +390,16 @@ def main():
commands.append([None, 'automember_rebuild', commands.append([None, 'automember_rebuild',
{"hosts": rebuild_hosts}]) {"hosts": rebuild_hosts}])
# Check mode exit # Execute commands
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)
if "completed" in result: changed = ansible_module.execute_ipa_commands(commands)
if result["completed"] > 0:
changed = True # result["failed"] is used only for INCLUDE_RE, EXCLUDE_RE
else: # if entries could not be added that are already there and
changed = True # if entries could not be removed that are not there.
except Exception as ex: # All other issues like invalid attributes etc. are handled
ansible_module.fail_json(msg="%s: %s: %s" % (command, name, # as exceptions. Therefore the error section is not here as
str(ex))) # in other modules.
# 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.
# Done # Done
ansible_module.exit_json(changed=changed, **exit_args) ansible_module.exit_json(changed=changed, **exit_args)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment