From 5537492f7f2e48697f5b5805ee735e7ff200358e Mon Sep 17 00:00:00 2001
From: Rafael Guterres Jeffman <rjeffman@redhat.com>
Date: Mon, 11 Jan 2021 17:09:36 -0300
Subject: [PATCH] Fix adding A/AAAA records with reverse in compatibility mode.
When adding A or AAAA records using the compatibility mode with
Ansible's community general plugin, the reverse (PTR) record was
added, but the A/AAAA record was not. This patch fixes the behavior.
Fix issue #491
---
plugins/modules/ipadnsrecord.py | 2 -
...test_compatibility_with_ansible_module.yml | 88 ++++++++++++++-----
2 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/plugins/modules/ipadnsrecord.py b/plugins/modules/ipadnsrecord.py
index 6c20c5da..aa6d39c4 100644
--- a/plugins/modules/ipadnsrecord.py
+++ b/plugins/modules/ipadnsrecord.py
@@ -1350,8 +1350,6 @@ def define_commands_for_present_state(module, zone_name, entry, res_find):
module, zone_name, name, args[record])
_commands.extend(cmds)
del args['%s_extra_create_reverse' % ipv]
- if '%s_ip_address' not in args:
- del args[record]
for record, fields in _RECORD_PARTS.items():
part_fields = [f for f in fields if f in args]
if part_fields:
diff --git a/tests/dnsrecord/test_compatibility_with_ansible_module.yml b/tests/dnsrecord/test_compatibility_with_ansible_module.yml
index e1631135..8de18c15 100644
--- a/tests/dnsrecord/test_compatibility_with_ansible_module.yml
+++ b/tests/dnsrecord/test_compatibility_with_ansible_module.yml
@@ -29,26 +29,32 @@
ipaadmin_password: SomeADMINpassword
name: host01
zone_name: testzone.local
- record_type: 'AAAA'
- record_value: '::1'
+ del_all: yes
state: absent
- - name: Ensure that dns record 'vm-001' is absent
+ - name: Ensure that dns records for 'vm-001' are absent
ipadnsrecord:
ipaadmin_password: SomeADMINpassword
name: vm-001
zone_name: testzone.local
- record_type: 'AAAA'
- record_value: '::1'
+ del_all: yes
state: absent
- - name: Ensure a PTR record is absent
+ - name: Ensure a PTR record is absent for 'vm-001'
ipadnsrecord:
ipaadmin_password: SomeADMINpassword
- name: 5
+ name: '1'
record_type: 'PTR'
- record_value: 'internal.ipa.testzone.local'
+ record_value: 'vm-001'
+ zone_name: 2.168.192.in-addr.arpa
+ state: absent
+
+ - name: Ensure a PTR record is absent
+ ipadnsrecord:
+ ipaadmin_password: SomeADMINpassword
zone_name: 2.168.192.in-addr.arpa
+ name: "5"
+ del_all: yes
state: absent
- name: Ensure a TXT record is absent
@@ -79,7 +85,7 @@
state: absent
# tests
- - name: Ensure dns record is present
+ - name: Ensure AAAA dns record is present
ipadnsrecord:
ipaadmin_password: SomeADMINpassword
name: vm-001
@@ -88,9 +94,9 @@
zone_name: testzone.local
state: present
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- - name: Ensure that dns record exists with a TTL
+ - name: Ensure that AAAA dns record exists with a TTL
ipadnsrecord:
ipaadmin_password: SomeADMINpassword
name: host01
@@ -100,18 +106,52 @@
zone_name: testzone.local
state: present
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure a PTR record is present
ipadnsrecord:
ipaadmin_password: SomeADMINpassword
- name: 5
+ name: '5'
record_type: 'PTR'
record_value: 'internal.ipa.testzone.local'
zone_name: 2.168.192.in-addr.arpa
state: present
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
+
+ - name: Ensure A record is present, with reverse
+ ipadnsrecord:
+ ipaadmin_password: SomeADMINpassword
+ name: vm-001
+ record_type: 'A'
+ record_value: '192.168.2.1'
+ create_reverse: yes
+ zone_name: testzone.local
+ state: present
+ register: result
+ failed_when: not result.changed or result.failed
+
+ - name: Ensure A record is present
+ ipadnsrecord:
+ ipaadmin_password: SomeADMINpassword
+ name: vm-001
+ record_type: 'A'
+ record_value: '192.168.2.1'
+ zone_name: testzone.local
+ state: present
+ register: result
+ failed_when: result.changed or result.failed
+
+ - name: Ensure PTR record is present
+ ipadnsrecord:
+ ipaadmin_password: SomeADMINpassword
+ name: '1'
+ record_type: 'PTR'
+ record_value: vm-001.testzone.local
+ zone_name: 2.168.192.in-addr.arpa
+ state: present
+ register: result
+ failed_when: result.changed or result.failed
- name: Ensure a TXT record is present
ipadnsrecord:
@@ -122,7 +162,7 @@
zone_name: testzone.local
state: present
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure a SRV record is present
ipadnsrecord:
@@ -133,7 +173,7 @@
zone_name: testzone.local
state: present
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure an MX record is present
ipadnsrecord:
@@ -144,7 +184,7 @@
zone_name: testzone.local
state: present
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure that dns record is removed
ipadnsrecord:
@@ -155,7 +195,7 @@
record_value: '::1'
state: absent
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
# cleanup
- name: Ensure that dns record 'host01' is absent
@@ -167,7 +207,7 @@
record_value: '::1'
state: absent
register: result
- failed_when: result.changed
+ failed_when: result.changed or result.failed
- name: Ensure that dns record 'vm-001' is absent
ipadnsrecord:
@@ -178,7 +218,7 @@
record_value: '::1'
state: absent
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure a PTR record is absent
ipadnsrecord:
@@ -189,7 +229,7 @@
zone_name: 2.168.192.in-addr.arpa
state: absent
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure a TXT record is absent
ipadnsrecord:
@@ -200,7 +240,7 @@
zone_name: testzone.local
state: absent
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure a SRV record is absent
ipadnsrecord:
@@ -211,7 +251,7 @@
zone_name: testzone.local
state: absent
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure an MX record is absent
ipadnsrecord:
@@ -222,7 +262,7 @@
zone_name: testzone.local
state: absent
register: result
- failed_when: not result.changed
+ failed_when: not result.changed or result.failed
- name: Ensure DNS zones to be used are absent.
ipadnszone:
--
GitLab