mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-07-25 00:44:42 +00:00
Fix error message when adding dnsforwardzone without forwarders.
This commit is contained in:
@@ -217,6 +217,11 @@ def main():
|
|||||||
# Make sure forwardzone exists
|
# Make sure forwardzone exists
|
||||||
existing_resource = find_dnsforwardzone(ansible_module, name)
|
existing_resource = find_dnsforwardzone(ansible_module, name)
|
||||||
|
|
||||||
|
# validate parameters
|
||||||
|
if state == 'present':
|
||||||
|
if existing_resource is None and not forwarders:
|
||||||
|
ansible_module.fail_json(msg='No forwarders specified.')
|
||||||
|
|
||||||
if existing_resource is None and operation == "update":
|
if existing_resource is None and operation == "update":
|
||||||
# does not exist and is updating
|
# does not exist and is updating
|
||||||
# trying to update something that doesn't exist, so error
|
# trying to update something that doesn't exist, so error
|
||||||
|
|||||||
@@ -5,10 +5,12 @@
|
|||||||
gather_facts: false
|
gather_facts: false
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
- name: ensure forwardzone example.com is absent - prep
|
- name: ensure test forwardzones are absent - prep
|
||||||
ipadnsforwardzone:
|
ipadnsforwardzone:
|
||||||
ipaadmin_password: SomeADMINpassword
|
ipaadmin_password: SomeADMINpassword
|
||||||
name: example.com
|
name:
|
||||||
|
- example.com
|
||||||
|
- newfailzone.com
|
||||||
state: absent
|
state: absent
|
||||||
|
|
||||||
- name: ensure forwardzone example.com is created
|
- name: ensure forwardzone example.com is created
|
||||||
@@ -207,6 +209,13 @@
|
|||||||
register: result
|
register: result
|
||||||
failed_when: result.changed
|
failed_when: result.changed
|
||||||
|
|
||||||
|
- name: Ensure forwardzone is not added without forwarders, with correct message.
|
||||||
|
ipadnsforwardzone:
|
||||||
|
ipaadmin_password: SomeADMINpassword
|
||||||
|
name: newfailzone.com
|
||||||
|
register: result
|
||||||
|
failed_when: not result.failed or "No forwarders specified" not in result.msg
|
||||||
|
|
||||||
- name: ensure forwardzone example.com is absent - tidy up
|
- name: ensure forwardzone example.com is absent - tidy up
|
||||||
ipadnsforwardzone:
|
ipadnsforwardzone:
|
||||||
ipaadmin_password: SomeADMINpassword
|
ipaadmin_password: SomeADMINpassword
|
||||||
|
|||||||
Reference in New Issue
Block a user