From 2c96d91d4c4b0f266e603cc3f4b6346d9a8fb8dd Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 3 Sep 2021 18:51:38 +0200
Subject: [PATCH] hbacsvcgroup: 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.
---
plugins/modules/ipahbacsvcgroup.py | 46 +++++++++++-------------------
1 file changed, 17 insertions(+), 29 deletions(-)
diff --git a/plugins/modules/ipahbacsvcgroup.py b/plugins/modules/ipahbacsvcgroup.py
index 5e301d6a..1e6e3439 100644
--- a/plugins/modules/ipahbacsvcgroup.py
+++ b/plugins/modules/ipahbacsvcgroup.py
@@ -136,6 +136,21 @@ def gen_member_args(hbacsvc):
return _args
+# pylint: disable=unused-argument
+def result_handler(module, result, command, name, args, errors):
+ # Get all errors
+ # All "already a member" and "not a member" failures in the
+ # result are ignored. All others are reported.
+ if "failed" in result and "member" in result["failed"]:
+ failed = result["failed"]["member"]
+ for member_type in failed:
+ for member, failure in failed[member_type]:
+ if "already a member" not in failure \
+ and "not a member" not in failure:
+ errors.append("%s: %s %s: %s" % (
+ command, member_type, member, failure))
+
+
def main():
ansible_module = IPAAnsibleModule(
argument_spec=dict(
@@ -278,36 +293,9 @@ def main():
else:
ansible_module.fail_json(msg="Unkown state '%s'" % state)
- # Check mode exit
- if ansible_module.check_mode:
- ansible_module.exit_json(changed=len(commands) > 0, **exit_args)
-
# Execute commands
- errors = []
- for name, command, args in commands:
- try:
- result = ansible_module.ipa_command(command, name, args)
- if "completed" in result:
- if result["completed"] > 0:
- changed = True
- else:
- changed = True
- except Exception as e:
- ansible_module.fail_json(msg="%s: %s: %s" % (command, name,
- str(e)))
- # Get all errors
- # All "already a member" and "not a member" failures in the
- # result are ignored. All others are reported.
- if "failed" in result and "member" in result["failed"]:
- failed = result["failed"]["member"]
- for member_type in failed:
- for member, failure in failed[member_type]:
- if "already a member" not in failure \
- and "not a member" not in failure:
- errors.append("%s: %s %s: %s" % (
- command, member_type, member, failure))
- if len(errors) > 0:
- ansible_module.fail_json(msg=", ".join(errors))
+
+ changed = ansible_module.execute_ipa_commands(commands, result_handler)
# Done
--
GitLab