diff --git a/roles/ipaserver/library/ipaserver_set_ds_password.py b/roles/ipaserver/library/ipaserver_set_ds_password.py index f4d767be2d0a185c909d3e80d851d12704df69af..f339fbc48ffe1c918b6d56908d2af715b8b40bb7 100644 --- a/roles/ipaserver/library/ipaserver_set_ds_password.py +++ b/roles/ipaserver/library/ipaserver_set_ds_password.py @@ -5,7 +5,7 @@ # # 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 # # This program is free software; you can redistribute it and/or modify @@ -39,64 +39,86 @@ description: Set DS password options: dm_password: description: Directory Manager password - required: no + type: str + required: yes password: description: Admin user kerberos password - required: no + type: str + required: yes domain: description: Primary DNS domain of the IPA deployment - required: no + type: str + required: yes realm: description: Kerberos realm name of the IPA deployment - required: no + type: str + required: yes hostname: description: Fully qualified name of this host - required: no + type: str + required: yes setup_ca: description: Configure a dogtag CA - required: no + type: bool + required: yes idstart: description: The starting value for the IDs range (default random) - required: no + type: int + required: yes idmax: description: The max value for the IDs range (default idstart+199999) - required: no + type: int + required: yes no_hbac_allow: description: Don't install allow_all HBAC rule - required: yes + type: bool + default: no + required: no no_pkinit: description: Disable pkinit setup steps - required: yes + type: bool + default: no + required: no dirsrv_config_file: description: The path to LDIF file that will be used to modify configuration of dse.ldif during installation of the directory server instance - required: yes + type: str + required: no _dirsrv_pkcs12_info: description: The installer _dirsrv_pkcs12_info setting - required: yes + type: list + elements: str + required: no dirsrv_cert_files: description: Files containing the Directory Server SSL certificate and private key - required: yes + type: list + elements: str + required: no subject_base: description: The certificate subject base (default O=<realm-name>). RDNs are in LDAP order (most specific RDN first). - required: yes + type: str + required: no ca_subject: description: The installer ca_subject setting - required: yes + type: str + required: no external_cert_files: description: File containing the IPA CA certificate and the external CA certificate chain - required: yes + type: list + elements: str + required: no domainlevel: description: The domain level - required: yes + type: int + required: no author: - - Thomas Woerner + - Thomas Woerner (@t-woerner) ''' EXAMPLES = ''' @@ -107,6 +129,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( + check_imports, MAX_DOMAIN_LEVEL, AnsibleModuleLog, options, sysrestore, paths, api_Backend_ldap2, ds_init_info, redirect_stdout, setup_logging ) @@ -116,25 +139,28 @@ def main(): ansible_module = AnsibleModule( argument_spec=dict( # basic - dm_password=dict(required=True, no_log=True), - password=dict(required=True, no_log=True), - domain=dict(required=True), - realm=dict(required=True), - hostname=dict(required=True), + dm_password=dict(required=True, type='str', no_log=True), + password=dict(required=True, type='str', no_log=True), + domain=dict(required=True, type='str'), + realm=dict(required=True, type='str'), + hostname=dict(required=True, type='str'), # server setup_ca=dict(required=True, type='bool'), idstart=dict(required=True, type='int'), idmax=dict(required=True, type='int'), no_hbac_allow=dict(required=False, type='bool', default=False), no_pkinit=dict(required=False, type='bool', default=False), - dirsrv_config_file=dict(required=False), - _dirsrv_pkcs12_info=dict(required=False, type='list'), + dirsrv_config_file=dict(required=False, type='str'), + _dirsrv_pkcs12_info=dict(required=False, type='list', + elements='str'), # ssl certificate - dirsrv_cert_files=dict(required=False, type='list', default=[]), - subject_base=dict(required=False), - ca_subject=dict(required=False), + dirsrv_cert_files=dict(required=False, type='list', elements='str', + default=[]), + subject_base=dict(required=False, type='str'), + ca_subject=dict(required=False, type='str'), # certificate system - external_cert_files=dict(required=False, type='list', default=[]), + external_cert_files=dict(required=False, type='list', + elements='str', default=[]), # additional domainlevel=dict(required=False, type='int', default=MAX_DOMAIN_LEVEL), @@ -142,6 +168,7 @@ def main(): ) ansible_module._ansible_debug = True + check_imports(ansible_module) setup_logging() ansible_log = AnsibleModuleLog(ansible_module)