Skip to content
Snippets Groups Projects
Unverified Commit 9b0558a9 authored by Thomas Woerner's avatar Thomas Woerner Committed by GitHub
Browse files

Merge pull request #807 from rjeffman/zone_forwarder_consistency

DNS forward policy: ensure consistency between module parameters.
parents ce143bad 10e9c30a
Branches
Tags
No related merge requests found
...@@ -129,7 +129,7 @@ Variable | Description | Required ...@@ -129,7 +129,7 @@ Variable | Description | Required
`forwarders` | The list of forwarders dicts. Each `forwarders` dict entry has:| no `forwarders` | The list of forwarders dicts. Each `forwarders` dict entry has:| no
  | `ip_address` - The IPv4 or IPv6 address of the DNS server. | yes   | `ip_address` - The IPv4 or IPv6 address of the DNS server. | yes
  | `port` - The custom port that should be used on this server. | no   | `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 `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 `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 `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
......
...@@ -110,7 +110,7 @@ Variable | Description | Required ...@@ -110,7 +110,7 @@ Variable | Description | Required
`forwarders` \| `idnsforwarders` | Per-zone forwarders. A custom port can be specified for each forwarder. Options | no `forwarders` \| `idnsforwarders` | Per-zone forwarders. A custom port can be specified for each forwarder. Options | no
  | `ip_address`: The forwarder IP address. | yes   | `ip_address`: The forwarder IP address. | yes
  | `port`: The forwarder IP port. | no   | `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 `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 `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 `action` | Work on group or member level. It can be on of `member` or `dnsforwardzone` and defaults to `dnsforwardzone`. | no
......
...@@ -54,6 +54,7 @@ options: ...@@ -54,6 +54,7 @@ options:
global forwarders. global forwarders.
required: false required: false
choices: ['only', 'first', 'none'] choices: ['only', 'first', 'none']
alias: ["forwardpolicy"]
allow_sync_ptr: allow_sync_ptr:
description: description:
Allow synchronization of forward (A, AAAA) and reverse (PTR) records. Allow synchronization of forward (A, AAAA) and reverse (PTR) records.
...@@ -189,7 +190,8 @@ def main(): ...@@ -189,7 +190,8 @@ def main():
forwarders=dict(type='list', default=None, required=False, forwarders=dict(type='list', default=None, required=False,
options=dict(**forwarder_spec)), options=dict(**forwarder_spec)),
forward_policy=dict(type='str', required=False, default=None, 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), allow_sync_ptr=dict(type='bool', required=False, default=None),
# general # general
......
...@@ -68,7 +68,7 @@ options: ...@@ -68,7 +68,7 @@ options:
required: false required: false
default: only default: only
choices: ["only", "first", "none"] choices: ["only", "first", "none"]
aliases: ["idnsforwarders"] aliases: ["idnsforwarders", "forward_policy"]
skip_overlap_check: skip_overlap_check:
description: description:
- Force DNS zone creation even if it will overlap with an existing zone. - Force DNS zone creation even if it will overlap with an existing zone.
...@@ -189,7 +189,8 @@ def main(): ...@@ -189,7 +189,8 @@ def main():
port=dict(type='int', required=False, port=dict(type='int', required=False,
default=None), default=None),
)), )),
forwardpolicy=dict(type='str', aliases=["idnsforwardpolicy"], forwardpolicy=dict(type='str',
aliases=["idnsforwardpolicy", "forward_policy"],
required=False, required=False,
choices=['only', 'first', 'none']), choices=['only', 'first', 'none']),
skip_overlap_check=dict(type='bool', required=False), skip_overlap_check=dict(type='bool', required=False),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment