internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-25 00:44:42 +00:00
Code Issues Projects Releases Wiki Activity

ipagroup: Rework to use same mechanisms as ipahostgroup module

Browse Source 
The ipagroup module was not using the failed and completed items in the dict
that is returned with api_command. But it was creating add and remove
lists for users, groups and services. This is not needed if the failures
"already a member" and "not a member" in the result failures are ignored.
Only other failures are reported.
This commit is contained in:
Thomas Woerner
2019-10-01 10:32:59 +02:00
parent 00066d2c28
commit c5e0b1b453
1 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
plugins/modules/ipagroup.py
View File

@@ -347,25 +347,12 @@ def main():
if res_find is None: if res_find is None:
ansible_module.fail_json(msg="No group '%s'" % name) ansible_module.fail_json(msg="No group '%s'" % name)
user_add = list( commands.append([name, "group_add_member",
set(user or []) - {
set(res_find.get("member_user", []))) "user": user,
group_add = list( "group": group,
set(group or []) - "service": service,
set(res_find.get("member_group", []))) }])
service_add = list(
set(service or []) -
set(res_find.get("member_service", [])))
# Add members
if len(user_add) > 0 or len(group_add) > 0 or \
len(service_add) > 0:
commands.append([name, "group_add_member",
{
"user": user,
"group": group,
"service": service,
}])
elif state == "absent": elif state == "absent":
if action == "group": if action == "group":
@@ -376,26 +363,12 @@ def main():
if res_find is None: if res_find is None:
ansible_module.fail_json(msg="No group '%s'" % name) ansible_module.fail_json(msg="No group '%s'" % name)
# Remove intersection member commands.append([name, "group_remove_member",
user_del = list( {
set(user or []) & "user": user,
set(res_find.get("member_user", []))) "group": group,
group_del = list( "service": service,
set(group or []) & }])
set(res_find.get("member_group", [])))
service_del = list(
set(service or []) &
set(res_find.get("member_service", [])))
# Remove members
if len(user_del) > 0 or len(group_del) > 0 or \
len(service_del) > 0:
commands.append([name, "group_remove_member",
{
"user": user,
"group": group,
"service": service,
}])
else: else:
ansible_module.fail_json(msg="Unkown state '%s'" % state) ansible_module.fail_json(msg="Unkown state '%s'" % state)
@@ -403,11 +376,29 @@ def main():
for name, command, args in commands: for name, command, args in commands:
try: try:
api_command(ansible_module, command, to_text(name), args) result = api_command(ansible_module, command, to_text(name),
changed = True args)
if "completed" in result and result["completed"] > 0:
changed = True
except Exception as e: except Exception as e:
ansible_module.fail_json(msg="%s: %s: %s" % (command, name, ansible_module.fail_json(msg="%s: %s: %s" % (command, name,
str(e))) str(e)))
# Get all errors
# All "already a member" and "not a member" failures in the
# result are ignored. All others are reported.
errors = []
if "failed" in result and len(result["failed"]) > 0:
for item in result["failed"]:
failed_item = result["failed"][item]
for member_type in failed_item:
for member, failure in failed_item[member_type]:
if "already a member" in failure \
or "not a member" in failure:
continue
errors.append("%s: %s %s: %s" % (
command, member_type, member, failure))
if len(errors) > 0:
ansible_module.fail_json(msg=", ".join(errors))
except Exception as e: except Exception as e:
ansible_module.fail_json(msg=str(e)) ansible_module.fail_json(msg=str(e))