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

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

The action is service and member for the module, but it needs to be the
module name and member.
parent c75b0292
Branches
Tags
No related merge requests found
...@@ -72,9 +72,9 @@ options: ...@@ -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(): ...@@ -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(): ...@@ -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(): ...@@ -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(): ...@@ -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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment