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

ipaclient_join: Fix documentation sections and agument spec

ansible-test with ansible-2.14 is adding a lot of new tests to ensure
that the documentation section and the agument spec is complete. Needed
changes:

DOCUMENTATION section

- `type: str` needs to be set for string parameters
- `type: list` needs to be set for list parameters
- `elements: str` needs to be given for list of string parameters
- `required` tags need to be fixed according to the `argument_spec`
- `type` tag needs to match `argument_spec`
- `author` needs to be given with the github user also: `Name (@user)`

argument_spec

- `type='str'` needs to be set for string parameters
- `elements='str'` needs to be added to all list of string parameters

supports_check_mode is turned off as it is not supported.

A call to ansible_ipa_client.check_imports has been added to check for import
errors.

The `copyright` date is extended with `-2022`.
parent 3c413cfd
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# #
# Based on ipa-client-install code # Based on ipa-client-install code
# #
# Copyright (C) 2017 Red Hat # Copyright (C) 2017-2022 Red Hat
# see file 'COPYING' for use and warranty information # see file 'COPYING' for use and warranty information
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -43,51 +43,67 @@ description: ...@@ -43,51 +43,67 @@ description:
options: options:
servers: servers:
description: Fully qualified name of IPA servers to enroll to description: Fully qualified name of IPA servers to enroll to
required: no type: list
elements: str
required: yes
domain: domain:
description: Primary DNS domain of the IPA deployment description: Primary DNS domain of the IPA deployment
required: no type: str
required: yes
realm: realm:
description: Kerberos realm name of the IPA deployment description: Kerberos realm name of the IPA deployment
required: no type: str
required: yes
hostname: hostname:
description: Fully qualified name of this host description: Fully qualified name of this host
required: no type: str
required: yes
kdc: kdc:
description: The name or address of the host running the KDC description: The name or address of the host running the KDC
required: no type: str
required: yes
basedn: basedn:
description: The basedn of the IPA server (of the form dc=example,dc=com) description: The basedn of the IPA server (of the form dc=example,dc=com)
required: no type: str
required: yes
principal: principal:
description: description:
User Principal allowed to promote replicas and join IPA realm User Principal allowed to promote replicas and join IPA realm
required: yes type: str
required: no
password: password:
description: Admin user kerberos password description: Admin user kerberos password
required: yes type: str
required: no
keytab: keytab:
description: Path to backed up keytab from previous enrollment description: Path to backed up keytab from previous enrollment
required: yes type: str
required: no
admin_keytab: admin_keytab:
description: The path to a local admin keytab description: The path to a local admin keytab
required: yes type: str
required: no
ca_cert_file: ca_cert_file:
description: description:
A CA certificate to use. Do not acquire the IPA CA certificate via A CA certificate to use. Do not acquire the IPA CA certificate via
automated means automated means
required: yes type: str
required: no
force_join: force_join:
description: Force client enrollment even if already enrolled description: Force client enrollment even if already enrolled
required: yes type: bool
required: no
kinit_attempts: kinit_attempts:
description: Repeat the request for host Kerberos ticket X times description: Repeat the request for host Kerberos ticket X times
required: yes type: int
required: no
default: 5
debug: debug:
description: Turn on extra debugging description: Turn on extra debugging
required: yes type: bool
required: no
author: author:
- Thomas Woerner - Thomas Woerner (@t-woerner)
''' '''
EXAMPLES = ''' EXAMPLES = '''
...@@ -130,7 +146,7 @@ import tempfile ...@@ -130,7 +146,7 @@ import tempfile
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ansible_ipa_client import ( from ansible.module_utils.ansible_ipa_client import (
setup_logging, setup_logging, check_imports,
SECURE_PATH, sysrestore, paths, options, configure_krb5_conf, SECURE_PATH, sysrestore, paths, options, configure_krb5_conf,
realm_to_suffix, kinit_keytab, GSSError, kinit_password, NUM_VERSION, realm_to_suffix, kinit_keytab, GSSError, kinit_password, NUM_VERSION,
get_ca_cert, get_ca_certs, errors, run get_ca_cert, get_ca_certs, errors, run
...@@ -140,25 +156,26 @@ from ansible.module_utils.ansible_ipa_client import ( ...@@ -140,25 +156,26 @@ from ansible.module_utils.ansible_ipa_client import (
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec=dict( argument_spec=dict(
servers=dict(required=True, type='list'), servers=dict(required=True, type='list', elements='str'),
domain=dict(required=True), domain=dict(required=True, type='str'),
realm=dict(required=True), realm=dict(required=True, type='str'),
hostname=dict(required=True), hostname=dict(required=True, type='str'),
kdc=dict(required=True), kdc=dict(required=True, type='str'),
basedn=dict(required=True), basedn=dict(required=True, type='str'),
principal=dict(required=False), principal=dict(required=False, type='str'),
password=dict(required=False, no_log=True), password=dict(required=False, type='str', no_log=True),
keytab=dict(required=False), keytab=dict(required=False, type='str', no_log=False),
admin_keytab=dict(required=False), admin_keytab=dict(required=False, type='str', no_log=False),
ca_cert_file=dict(required=False), ca_cert_file=dict(required=False, type='str'),
force_join=dict(required=False, type='bool'), force_join=dict(required=False, type='bool'),
kinit_attempts=dict(required=False, type='int', default=5), kinit_attempts=dict(required=False, type='int', default=5),
debug=dict(required=False, type='bool'), debug=dict(required=False, type='bool'),
), ),
supports_check_mode=True, supports_check_mode=False,
) )
module._ansible_debug = True module._ansible_debug = True
check_imports(module)
setup_logging() setup_logging()
servers = module.params.get('servers') servers = module.params.get('servers')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment