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

selfservice: Use IPAAnsibleModule class

ipaadmin_variables are handled by IPAAnsibleModule,
ansible_module.params_get is used to get the parameters and
ansible_module.ipa_connect is used to simplify the module.
parent 954ae982
Branches
Tags
No related merge requests found
...@@ -31,13 +31,9 @@ DOCUMENTATION = """ ...@@ -31,13 +31,9 @@ DOCUMENTATION = """
module: ipaselfservice module: ipaselfservice
short description: Manage FreeIPA selfservices short description: Manage FreeIPA selfservices
description: Manage FreeIPA selfservices and selfservice attributes description: Manage FreeIPA selfservices and selfservice attributes
extends_documentation_fragment:
- ipamodule_base_docs
options: options:
ipaadmin_principal:
description: The admin principal.
default: admin
ipaadmin_password:
description: The admin password.
required: false
name: name:
description: The list of selfservice name strings. description: The list of selfservice name strings.
required: true required: true
...@@ -103,21 +99,14 @@ RETURN = """ ...@@ -103,21 +99,14 @@ RETURN = """
""" """
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ansible_freeipa_module import \ from ansible.module_utils.ansible_freeipa_module import \
temp_kinit, temp_kdestroy, valid_creds, api_connect, api_command, \ IPAAnsibleModule, compare_args_ipa
compare_args_ipa, module_params_get
import six
if six.PY3:
unicode = str
def find_selfservice(module, name): def find_selfservice(module, name):
"""Find if a selfservice with the given name already exist.""" """Find if a selfservice with the given name already exist."""
try: try:
_result = api_command(module, "selfservice_show", name, {"all": True}) _result = module.ipa_command("selfservice_show", name, {"all": True})
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
# An exception is raised if selfservice name is not found. # An exception is raised if selfservice name is not found.
return None return None
...@@ -135,12 +124,9 @@ def gen_args(permission, attribute): ...@@ -135,12 +124,9 @@ def gen_args(permission, attribute):
def main(): def main():
ansible_module = AnsibleModule( ansible_module = IPAAnsibleModule(
argument_spec=dict( argument_spec=dict(
# general # general
ipaadmin_principal=dict(type="str", default="admin"),
ipaadmin_password=dict(type="str", required=False, no_log=True),
name=dict(type="list", aliases=["aciname"], default=None, name=dict(type="list", aliases=["aciname"], default=None,
required=True), required=True),
# present # present
...@@ -162,17 +148,14 @@ def main(): ...@@ -162,17 +148,14 @@ def main():
# Get parameters # Get parameters
# general # general
ipaadmin_principal = module_params_get(ansible_module, names = ansible_module.params_get("name")
"ipaadmin_principal")
ipaadmin_password = module_params_get(ansible_module, "ipaadmin_password")
names = module_params_get(ansible_module, "name")
# present # present
permission = module_params_get(ansible_module, "permission") permission = ansible_module.params_get("permission")
attribute = module_params_get(ansible_module, "attribute") attribute = ansible_module.params_get("attribute")
action = module_params_get(ansible_module, "action") action = ansible_module.params_get("action")
# state # state
state = module_params_get(ansible_module, "state") state = ansible_module.params_get("state")
# Check parameters # Check parameters
...@@ -219,13 +202,9 @@ def main(): ...@@ -219,13 +202,9 @@ def main():
changed = False changed = False
exit_args = {} exit_args = {}
ccache_dir = None
ccache_name = None # Connect to IPA API
try: with ansible_module.ipa_connect():
if not valid_creds(ansible_module, ipaadmin_principal):
ccache_dir, ccache_name = temp_kinit(ipaadmin_principal,
ipaadmin_password)
api_connect()
commands = [] commands = []
for name in names: for name in names:
...@@ -301,8 +280,7 @@ def main(): ...@@ -301,8 +280,7 @@ def main():
for name, command, args in commands: for name, command, args in commands:
try: try:
result = api_command(ansible_module, command, name, result = ansible_module.ipa_command(command, name, args)
args)
if "completed" in result: if "completed" in result:
if result["completed"] > 0: if result["completed"] > 0:
changed = True changed = True
...@@ -312,12 +290,6 @@ def main(): ...@@ -312,12 +290,6 @@ def main():
ansible_module.fail_json(msg="%s: %s: %s" % (command, name, ansible_module.fail_json(msg="%s: %s: %s" % (command, name,
str(e))) str(e)))
except Exception as e:
ansible_module.fail_json(msg=str(e))
finally:
temp_kdestroy(ccache_dir, ccache_name)
# 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.
Please register or to comment