From 72d9fea37add7fd6c465c666173650773d9ea111 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 8 Nov 2022 14:08:48 +0100
Subject: [PATCH] ipareplica_setup_custodia: 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_replica.check_imports has been added to check for import
errors.
The `copyright` date is extended with `-2022`.
---
.../library/ipareplica_setup_custodia.py | 69 ++++++++++++-------
1 file changed, 43 insertions(+), 26 deletions(-)
diff --git a/roles/ipareplica/library/ipareplica_setup_custodia.py b/roles/ipareplica/library/ipareplica_setup_custodia.py
index 69b35d7c..09ab1721 100644
--- a/roles/ipareplica/library/ipareplica_setup_custodia.py
+++ b/roles/ipareplica/library/ipareplica_setup_custodia.py
@@ -5,7 +5,7 @@
#
# Based on ipa-replica-install code
#
-# Copyright (C) 2018 Red Hat
+# Copyright (C) 2018-2022 Red Hat
# see file 'COPYING' for use and warranty information
#
# This program is free software; you can redistribute it and/or modify
@@ -40,50 +40,65 @@ description:
options:
setup_ca:
description: Configure a dogtag CA
- required: yes
+ type: bool
+ required: no
setup_kra:
description: Configure a dogtag KRA
- required: yes
+ type: bool
+ required: no
no_pkinit:
description: Disable pkinit setup steps
- required: yes
+ type: bool
+ required: no
no_ui_redirect:
description: Do not automatically redirect to the Web UI
- required: yes
+ type: bool
+ required: no
subject_base:
description:
The certificate subject base (default O=<realm-name>).
RDNs are in LDAP order (most specific RDN first).
- required: no
+ type: str
+ required: yes
config_master_host_name:
description: The config master_host_name setting
- required: no
+ type: str
+ required: yes
ccache:
description: The local ccache
- required: no
+ type: str
+ required: yes
_ca_enabled:
description: The installer _ca_enabled setting
- required: yes
+ type: bool
+ required: no
_ca_file:
description: The installer _ca_file setting
- required: yes
+ type: str
+ required: no
_kra_enabled:
description: The installer _kra_enabled setting
- required: yes
+ type: bool
+ required: no
_kra_host_name:
description: The installer _kra_host_name setting
- required: yes
+ type: str
+ required: no
_pkinit_pkcs12_info:
description: The installer _pkinit_pkcs12_info setting
- required: yes
+ type: list
+ elements: str
+ required: no
_top_dir:
description: The installer _top_dir setting
- required: no
+ type: str
+ required: yes
dirman_password:
description: Directory Manager (master) password
- required: no
+ type: str
+ required: yes
author:
- - Thomas Woerner
+ - Thomas Woerner (@t-woerner)
'''
EXAMPLES = '''
@@ -96,7 +111,7 @@ import os
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ansible_ipa_replica import (
- AnsibleModuleLog, setup_logging, installer, DN, paths,
+ check_imports, AnsibleModuleLog, setup_logging, installer, DN, paths,
gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, custodiainstance
)
@@ -111,22 +126,24 @@ def main():
no_pkinit=dict(required=False, type='bool'),
no_ui_redirect=dict(required=False, type='bool'),
# certificate system
- subject_base=dict(required=True),
+ subject_base=dict(required=True, type='str'),
# additional
- config_master_host_name=dict(required=True),
- ccache=dict(required=True),
+ config_master_host_name=dict(required=True, type='str'),
+ ccache=dict(required=True, type='str'),
_ca_enabled=dict(required=False, type='bool'),
- _ca_file=dict(required=False),
+ _ca_file=dict(required=False, type='str'),
_kra_enabled=dict(required=False, type='bool'),
- _kra_host_name=dict(required=False),
- _pkinit_pkcs12_info=dict(required=False, type='list'),
- _top_dir=dict(required=True),
- dirman_password=dict(required=True, no_log=True),
+ _kra_host_name=dict(required=False, type='str'),
+ _pkinit_pkcs12_info=dict(required=False, type='list',
+ elements='str'),
+ _top_dir=dict(required=True, type='str'),
+ dirman_password=dict(required=True, type='str', no_log=True),
),
- supports_check_mode=True,
+ supports_check_mode=False,
)
ansible_module._ansible_debug = True
+ check_imports(ansible_module)
setup_logging()
ansible_log = AnsibleModuleLog(ansible_module)
--
GitLab