internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-25 00:44:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #493 from rjeffman/fix_dnsrecord_reverse_compatibility_mode

Browse Source 
Fix adding A/AAAA records with reverse in compatibility mode.
This commit is contained in:
Varun Mylaraiah
2021-01-18 16:58:22 +05:30
committed by GitHub
parent 9e912d2bd9 5537492f7f
commit b738085ba4
2 changed files with 64 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/modules/ipadnsrecord.py
View File

@@ -1350,8 +1350,6 @@ def define_commands_for_present_state(module, zone_name, entry, res_find):
module, zone_name, name, args[record]) module, zone_name, name, args[record])
_commands.extend(cmds) _commands.extend(cmds)
del args['%s_extra_create_reverse' % ipv] del args['%s_extra_create_reverse' % ipv]
if '%s_ip_address' not in args:
del args[record]
for record, fields in _RECORD_PARTS.items(): for record, fields in _RECORD_PARTS.items():
part_fields = [f for f in fields if f in args] part_fields = [f for f in fields if f in args]
if part_fields: if part_fields:

88
tests/dnsrecord/test_compatibility_with_ansible_module.yml
View File

@@ -29,26 +29,32 @@
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: host01 name: host01
zone_name: testzone.local zone_name: testzone.local
record_type: 'AAAA' del_all: yes
record_value: '::1'
state: absent state: absent
- name: Ensure that dns record 'vm-001' is absent - name: Ensure that dns records for 'vm-001' are absent
ipadnsrecord: ipadnsrecord:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: vm-001 name: vm-001
zone_name: testzone.local zone_name: testzone.local
record_type: 'AAAA' del_all: yes
record_value: '::1' state: absent
- name: Ensure a PTR record is absent for 'vm-001'
ipadnsrecord:
ipaadmin_password: SomeADMINpassword
name: '1'
record_type: 'PTR'
record_value: 'vm-001'
zone_name: 2.168.192.in-addr.arpa
state: absent state: absent
- name: Ensure a PTR record is absent - name: Ensure a PTR record is absent
ipadnsrecord: ipadnsrecord:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: 5
record_type: 'PTR'
record_value: 'internal.ipa.testzone.local'
zone_name: 2.168.192.in-addr.arpa zone_name: 2.168.192.in-addr.arpa
name: "5"
del_all: yes
state: absent state: absent
- name: Ensure a TXT record is absent - name: Ensure a TXT record is absent
@@ -79,7 +85,7 @@
state: absent state: absent
# tests # tests
- name: Ensure dns record is present - name: Ensure AAAA dns record is present
ipadnsrecord: ipadnsrecord:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: vm-001 name: vm-001
@@ -88,9 +94,9 @@
zone_name: testzone.local zone_name: testzone.local
state: present state: present
register: result 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: ipadnsrecord:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: host01 name: host01
@@ -100,18 +106,52 @@
zone_name: testzone.local zone_name: testzone.local
state: present state: present
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure a PTR record is present - name: Ensure a PTR record is present
ipadnsrecord: ipadnsrecord:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
name: 5 name: '5'
record_type: 'PTR' record_type: 'PTR'
record_value: 'internal.ipa.testzone.local' record_value: 'internal.ipa.testzone.local'
zone_name: 2.168.192.in-addr.arpa zone_name: 2.168.192.in-addr.arpa
state: present state: present
register: result 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 - name: Ensure a TXT record is present
ipadnsrecord: ipadnsrecord:
@@ -122,7 +162,7 @@
zone_name: testzone.local zone_name: testzone.local
state: present state: present
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure a SRV record is present - name: Ensure a SRV record is present
ipadnsrecord: ipadnsrecord:
@@ -133,7 +173,7 @@
zone_name: testzone.local zone_name: testzone.local
state: present state: present
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure an MX record is present - name: Ensure an MX record is present
ipadnsrecord: ipadnsrecord:
@@ -144,7 +184,7 @@
zone_name: testzone.local zone_name: testzone.local
state: present state: present
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure that dns record is removed - name: Ensure that dns record is removed
ipadnsrecord: ipadnsrecord:
@@ -155,7 +195,7 @@
record_value: '::1' record_value: '::1'
state: absent state: absent
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
# cleanup # cleanup
- name: Ensure that dns record 'host01' is absent - name: Ensure that dns record 'host01' is absent
@@ -167,7 +207,7 @@
record_value: '::1' record_value: '::1'
state: absent state: absent
register: result register: result
failed_when: result.changed failed_when: result.changed or result.failed
- name: Ensure that dns record 'vm-001' is absent - name: Ensure that dns record 'vm-001' is absent
ipadnsrecord: ipadnsrecord:
@@ -178,7 +218,7 @@
record_value: '::1' record_value: '::1'
state: absent state: absent
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure a PTR record is absent - name: Ensure a PTR record is absent
ipadnsrecord: ipadnsrecord:
@@ -189,7 +229,7 @@
zone_name: 2.168.192.in-addr.arpa zone_name: 2.168.192.in-addr.arpa
state: absent state: absent
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure a TXT record is absent - name: Ensure a TXT record is absent
ipadnsrecord: ipadnsrecord:
@@ -200,7 +240,7 @@
zone_name: testzone.local zone_name: testzone.local
state: absent state: absent
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure a SRV record is absent - name: Ensure a SRV record is absent
ipadnsrecord: ipadnsrecord:
@@ -211,7 +251,7 @@
zone_name: testzone.local zone_name: testzone.local
state: absent state: absent
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure an MX record is absent - name: Ensure an MX record is absent
ipadnsrecord: ipadnsrecord:
@@ -222,7 +262,7 @@
zone_name: testzone.local zone_name: testzone.local
state: absent state: absent
register: result register: result
failed_when: not result.changed failed_when: not result.changed or result.failed
- name: Ensure DNS zones to be used are absent. - name: Ensure DNS zones to be used are absent.
ipadnszone: ipadnszone: