diff --git a/README-dnsconfig.md b/README-dnsconfig.md index 0254408283d5f46370c0282bf9724cbbb77b4268..b11fc220c3e00b3c54f30fde4c52b0f04ad2c010 100644 --- a/README-dnsconfig.md +++ b/README-dnsconfig.md @@ -129,7 +129,7 @@ Variable | Description | Required `forwarders` | The list of forwarders dicts. Each `forwarders` dict entry has:| no | `ip_address` - The IPv4 or IPv6 address of the DNS server. | yes | `port` - The custom port that should be used on this server. | no -`forward_policy` | The global forwarding policy. It can be one of `only`, `first`, or `none`. | no +`forward_policy` \| `forwardpolicy` | The global forwarding policy. It can be one of `only`, `first`, or `none`. | no `allow_sync_ptr` | Allow synchronization of forward (A, AAAA) and reverse (PTR) records (bool). | yes `action` | Work on dnsconfig or member level. It can be one of `member` or `dnsconfig` and defaults to `dnsconfig`. Only `forwarders` can be managed with `action: member`. | no `state` | The state to ensure. It can be one of `present` or `absent`, default: `present`. `absent` can only be used with `action: member` and `forwarders`. | yes diff --git a/README-dnsforwardzone.md b/README-dnsforwardzone.md index 9274698448cbb485dcf65842dfa7338c9a48b7ad..b3bccca3ac6c95caee70639a4f41ed99bd4ed0d4 100644 --- a/README-dnsforwardzone.md +++ b/README-dnsforwardzone.md @@ -110,7 +110,7 @@ Variable | Description | Required `forwarders` \| `idnsforwarders` | Per-zone forwarders. A custom port can be specified for each forwarder. Options | no | `ip_address`: The forwarder IP address. | yes | `port`: The forwarder IP port. | no -`forwardpolicy` \| `idnsforwardpolicy` | Per-zone conditional forwarding policy. Possible values are `only`, `first`, `none`. Set to "none" to disable forwarding to global forwarder for this zone. In that case, conditional zone forwarders are disregarded. | no +`forwardpolicy` \| `idnsforwardpolicy` \| `forward_policy` | Per-zone conditional forwarding policy. Possible values are `only`, `first`, `none`. Set to "none" to disable forwarding to global forwarder for this zone. In that case, conditional zone forwarders are disregarded. | no `skip_overlap_check` | Force DNS zone creation even if it will overlap with an existing zone. Defaults to False. | no `permission` | Allow DNS Forward Zone to be managed. (bool) | no `action` | Work on group or member level. It can be on of `member` or `dnsforwardzone` and defaults to `dnsforwardzone`. | no diff --git a/plugins/modules/ipadnsconfig.py b/plugins/modules/ipadnsconfig.py index 020b9bcd4b325032dca88c9265a564f86f0e3f75..d363d37c43df6efa81e955ddd346de8491984f6f 100644 --- a/plugins/modules/ipadnsconfig.py +++ b/plugins/modules/ipadnsconfig.py @@ -54,6 +54,7 @@ options: global forwarders. required: false choices: ['only', 'first', 'none'] + alias: ["forwardpolicy"] allow_sync_ptr: description: Allow synchronization of forward (A, AAAA) and reverse (PTR) records. @@ -189,7 +190,8 @@ def main(): forwarders=dict(type='list', default=None, required=False, options=dict(**forwarder_spec)), forward_policy=dict(type='str', required=False, default=None, - choices=['only', 'first', 'none']), + choices=['only', 'first', 'none'], + aliases=["forwardpolicy"]), allow_sync_ptr=dict(type='bool', required=False, default=None), # general diff --git a/plugins/modules/ipadnsforwardzone.py b/plugins/modules/ipadnsforwardzone.py index f8d19933e97f521c34827020191414346730aa78..99aa226da9d37656f47554e1d119fd2030829077 100644 --- a/plugins/modules/ipadnsforwardzone.py +++ b/plugins/modules/ipadnsforwardzone.py @@ -68,7 +68,7 @@ options: required: false default: only choices: ["only", "first", "none"] - aliases: ["idnsforwarders"] + aliases: ["idnsforwarders", "forward_policy"] skip_overlap_check: description: - Force DNS zone creation even if it will overlap with an existing zone. @@ -189,7 +189,8 @@ def main(): port=dict(type='int', required=False, default=None), )), - forwardpolicy=dict(type='str', aliases=["idnsforwardpolicy"], + forwardpolicy=dict(type='str', + aliases=["idnsforwardpolicy", "forward_policy"], required=False, choices=['only', 'first', 'none']), skip_overlap_check=dict(type='bool', required=False),