From 76058b283b9144be24f6705792c379a903683755 Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Thu, 19 Nov 2020 12:29:40 -0300
Subject: [PATCH] ipadnsforwardzone: Fix documentation for `forwarders` usage.
Examples of dnsforwarzone were using a single string rather than a
dict of values to set attribute `forwarders`. Both source code and
README examples were fixed.
Fix issue #446
---
README-dnsforwardzone.md | 23 ++++++++++++++++-------
plugins/modules/ipadnsforwardzone.py | 15 +++++++++++++--
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/README-dnsforwardzone.md b/README-dnsforwardzone.md
index 32de7bfe..24986081 100644
--- a/README-dnsforwardzone.md
+++ b/README-dnsforwardzone.md
@@ -47,13 +47,13 @@ Example playbook to ensure presence of a forwardzone to ipa DNS:
become: true
tasks:
- - name: ensure presence of forwardzone for DNS requests for example.com to 8.8.8.8
+ - name: ensure presence of forwardzone with a single forwarder DNS server
ipadnsforwardzone:
ipaadmin_password: SomeADMINpassword
state: present
name: example.com
forwarders:
- - 8.8.8.8
+ - ip_address: 8.8.8.8
forwardpolicy: first
skip_overlap_check: true
@@ -63,14 +63,14 @@ Example playbook to ensure presence of a forwardzone to ipa DNS:
name: example.com
state: disabled
- - name: ensure presence of multiple upstream DNS servers for example.com
+ - name: ensure presence of forwardzone with multiple forwarder DNS server
ipadnsforwardzone:
ipaadmin_password: SomeADMINpassword
state: present
name: example.com
forwarders:
- - 8.8.8.8
- - 4.4.4.4
+ - ip_address: 8.8.8.8
+ - ip_address: 4.4.4.4
- name: ensure presence of another forwarder to any existing ones for example.com
ipadnsforwardzone:
@@ -78,10 +78,19 @@ Example playbook to ensure presence of a forwardzone to ipa DNS:
state: present
name: example.com
forwarders:
- - 1.1.1.1
+ - ip_address: 1.1.1.1
action: member
- - name: ensure the forwarder for example.com does not exists (delete it if needed)
+ - name: ensure presence of forwardzone with single forwarder DNS server on non-stardard port
+ ipadnsforwardzone:
+ ipaadmin_password: SomeADMINpassword
+ state: present
+ name: example.com
+ forwarders:
+ - ip_address: 4.4.4.4
+ port: 8053
+
+ - name: ensure the forward zone is absent
ipadnsforwardzone:
ipaadmin_password: SomeADMINpassword
name: example.com
diff --git a/plugins/modules/ipadnsforwardzone.py b/plugins/modules/ipadnsforwardzone.py
index 1ffba38e..69ee040f 100644
--- a/plugins/modules/ipadnsforwardzone.py
+++ b/plugins/modules/ipadnsforwardzone.py
@@ -89,8 +89,19 @@ EXAMPLES = '''
state: present
name: example.com
forwarders:
- - 8.8.8.8
- - 4.4.4.4
+ - ip_address: 8.8.8.8
+ - ip_address: 4.4.4.4
+ forwardpolicy: first
+ skip_overlap_check: true
+
+# Ensure dns zone is present, with forwarder on non-default port
+- ipadnsforwardzone:
+ ipaadmin_password: MyPassword123
+ state: present
+ name: example.com
+ forwarders:
+ - ip_address: 8.8.8.8
+ port: 8053
forwardpolicy: first
skip_overlap_check: true
--
GitLab