internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 11:54:47 +00:00
Code Issues Projects Releases Wiki Activity

automember: Fix action to be automember or member, not service

Browse Source 
The action is service and member for the module, but it needs to be the
module name and member.
This commit is contained in:
Thomas Woerner
2021-06-25 16:10:05 +02:00
parent c75b0292a1
commit fadb62dc81
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/modules/ipaautomember.py
View File

@@ -72,9 +72,9 @@ options:
elements: dict elements: dict
aliases: ["automemberinclusiveregex"] aliases: ["automemberinclusiveregex"]
action: action:
description: Work on service or member level description: Work on automember or member level
default: service default: automember
choices: ["member", "service"] choices: ["member", "automember"]
state: state:
description: State to ensure description: State to ensure
default: present default: present
@@ -183,8 +183,8 @@ def main():
description=dict(type="str", default=None), description=dict(type="str", default=None),
automember_type=dict(type='str', required=False, automember_type=dict(type='str', required=False,
choices=['group', 'hostgroup']), choices=['group', 'hostgroup']),
action=dict(type="str", default="service", action=dict(type="str", default="automember",
choices=["member", "service"]), choices=["member", "automember"]),
state=dict(type="str", default="present", state=dict(type="str", default="present",
choices=["present", "absent", "rebuild"]), choices=["present", "absent", "rebuild"]),
users=dict(type="list", default=None), users=dict(type="list", default=None),
@@ -250,7 +250,7 @@ def main():
if state == 'present': if state == 'present':
args = gen_args(description, automember_type) args = gen_args(description, automember_type)
if action == "service": if action == "automember":
if res_find is not None: if res_find is not None:
if not compare_args_ipa(ansible_module, if not compare_args_ipa(ansible_module,
args, args,
@@ -273,7 +273,8 @@ def main():
elif action == "member": elif action == "member":
if res_find is None: if res_find is None:
ansible_module.fail_json(msg="No service '%s'" % name) ansible_module.fail_json(
msg="No automember '%s'" % name)
inclusive_add = transform_conditions(inclusive or []) inclusive_add = transform_conditions(inclusive or [])
inclusive_del = [] inclusive_del = []
@@ -309,14 +310,15 @@ def main():
condition_args]) condition_args])
elif state == 'absent': elif state == 'absent':
if action == "service": if action == "automember":
if res_find is not None: if res_find is not None:
commands.append([name, 'automember_del', commands.append([name, 'automember_del',
{'type': to_text(automember_type)}]) {'type': to_text(automember_type)}])
elif action == "member": elif action == "member":
if res_find is None: if res_find is None:
ansible_module.fail_json(msg="No service '%s'" % name) ansible_module.fail_json(
msg="No automember '%s'" % name)
if inclusive is not None: if inclusive is not None:
for _inclusive in transform_conditions(inclusive): for _inclusive in transform_conditions(inclusive):