internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 11:54:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #735 from rjeffman/ipadnsconfig_fix_512

Browse Source 
dnsconfig: Fix management of forwarders.
This commit is contained in:
Thomas Woerner
2022-01-20 12:17:00 +01:00
committed by GitHub
parent 65015e63e9 dead467982
commit 3a0a1a7529
2 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/modules/ipadnsconfig.py
View File

@@ -144,8 +144,8 @@ def gen_args(module, state, dnsconfig, forwarders, forward_policy,
_args['idnsforwarders'] = [''] _args['idnsforwarders'] = ['']
elif state == 'present': elif state == 'present':
_args['idnsforwarders'] = [ _args['idnsforwarders'] = \
fwd for fwd in _forwarders if fwd not in global_forwarders] list(set(list(_forwarders) + list(global_forwarders)))
# If no forwarders should be added, remove argument. # If no forwarders should be added, remove argument.
if not _args['idnsforwarders']: if not _args['idnsforwarders']:
del _args['idnsforwarders'] del _args['idnsforwarders']

49
tests/dnsconfig/test_dnsconfig.yml
View File

@@ -171,7 +171,6 @@
register: result register: result
failed_when: not result.changed or result.failed failed_when: not result.changed or result.failed
- name: Ensure all forwarders are absent, again. - name: Ensure all forwarders are absent, again.
ipadnsconfig: ipadnsconfig:
ipaadmin_password: SomeADMINpassword ipaadmin_password: SomeADMINpassword
@@ -185,6 +184,54 @@
register: result register: result
failed_when: result.changed or result.failed failed_when: result.changed or result.failed
- name: Ensure forwarder is present.
ipadnsconfig:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
forwarders:
- ip_address: 8.8.8.8
register: result
failed_when: not result.changed or result.failed
- name: Ensure forwarders are present.
ipadnsconfig:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
forwarders:
- ip_address: 8.8.4.4
- ip_address: 8.8.8.8
register: result
failed_when: not result.changed or result.failed
- name: Ensure forwarders are present, again.
ipadnsconfig:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
forwarders:
- ip_address: 8.8.4.4
- ip_address: 8.8.8.8
register: result
failed_when: result.changed or result.failed
- name: Ensure another forwarder is present.
ipadnsconfig:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
forwarders:
- ip_address: 8.8.4.4
register: result
failed_when: result.changed or result.failed
- name: Ensure forwarders are present.
ipadnsconfig:
ipaadmin_password: SomeADMINpassword
ipaapi_context: "{{ ipa_context | default(omit) }}"
forwarders:
- ip_address: 8.8.4.4
- ip_address: 8.8.8.8
register: result
failed_when: result.changed or result.failed
# Cleanup. # Cleanup.
- name: Ensure forwarders are absent. - name: Ensure forwarders are absent.
ipadnsconfig: ipadnsconfig: