From 12ee8a920121a7821be14ee244bf6df26ca61a15 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 8 Nov 2022 14:10:18 +0100
Subject: [PATCH] ipareplica_setup_dns: 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_dns.py | 73 ++++++++++++-------
1 file changed, 47 insertions(+), 26 deletions(-)
diff --git a/roles/ipareplica/library/ipareplica_setup_dns.py b/roles/ipareplica/library/ipareplica_setup_dns.py
index 741cf497..7dadafca 100644
--- a/roles/ipareplica/library/ipareplica_setup_dns.py
+++ b/roles/ipareplica/library/ipareplica_setup_dns.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,47 +40,65 @@ description:
options:
setup_kra:
description: Configure a dogtag KRA
- required: yes
+ type: bool
+ required: no
setup_dns:
description: Configure bind with our zone
- 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
zonemgr:
description: DNS zone manager e-mail address. Defaults to hostmaster@DOMAIN
- required: yes
+ type: str
+ required: no
forwarders:
description: Add DNS forwarders
- required: yes
+ type: list
+ elements: str
+ required: no
forward_policy:
description: DNS forwarding policy for global forwarders
- required: yes
+ type: str
+ choices: ['first', 'only']
+ required: no
no_dnssec_validation:
description: Disable DNSSEC validation
- required: yes
+ type: bool
+ default: no
+ required: no
dns_ip_addresses:
description: The dns ip_addresses setting
- required: no
+ type: list
+ elements: str
+ required: yes
dns_reverse_zones:
description: The dns reverse_zones setting
- required: no
+ type: list
+ elements: str
+ required: yes
ccache:
description: The local ccache
- required: no
+ type: str
+ required: yes
_top_dir:
description: The installer _top_dir setting
- required: no
+ type: str
+ required: yes
setup_ca:
description: Configure a dogtag CA
- required: no
+ type: bool
+ required: yes
config_master_host_name:
description: The config master_host_name setting
- required: no
+ type: str
+ required: yes
author:
- - Thomas Woerner
+ - Thomas Woerner (@t-woerner)
'''
EXAMPLES = '''
@@ -93,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, dns,
ansible_module_get_parsed_ip_addresses
@@ -107,25 +125,28 @@ def main():
setup_kra=dict(required=False, type='bool'),
setup_dns=dict(required=False, type='bool'),
# certificate system
- subject_base=dict(required=True),
+ subject_base=dict(required=True, type='str'),
# dns
- zonemgr=dict(required=False),
- forwarders=dict(required=False, type='list', default=[]),
- forward_policy=dict(default=None, choices=['first', 'only']),
+ zonemgr=dict(required=False, type='str'),
+ forwarders=dict(required=False, type='list', elements='str',
+ default=[]),
+ forward_policy=dict(required=False, type='str',
+ choices=['first', 'only'], default=None),
no_dnssec_validation=dict(required=False, type='bool',
default=False),
# additional
- dns_ip_addresses=dict(required=True, type='list'),
- dns_reverse_zones=dict(required=True, type='list'),
- ccache=dict(required=True),
- _top_dir=dict(required=True),
+ dns_ip_addresses=dict(required=True, type='list', elements='str'),
+ dns_reverse_zones=dict(required=True, type='list', elements='str'),
+ ccache=dict(required=True, type='str'),
+ _top_dir=dict(required=True, type='str'),
setup_ca=dict(required=True, type='bool'),
- config_master_host_name=dict(required=True),
+ config_master_host_name=dict(required=True, type='str'),
),
- 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