[Backport][Stable-2] Backport for #715 and #719 (#735)

* firewalld_info: Use module.warn (#715)

* Use module.warn to display warnings instead of module.exit_json

Fixes: #710

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
(cherry picked from commit d88a3c833c)

* firewalld_info: Use PY2 compatible syntax (#719)

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
(cherry picked from commit dbeb4a861d)

---------

Signed-off-by: Abhijeet Kasurde <Akasurde@redhat.com>
Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Hideki Saito
2026-05-18 11:58:00 +09:00
committed by GitHub
parent 0b197ad440
commit ec51a15f69
3 changed files with 8 additions and 7 deletions

View File

@@ -0,0 +1,3 @@
---
minor_changes:
- firewalld_info - use module.warn instead of passing ``warnings`` to ``exit_json`` (https://github.com/ansible-collections/ansible.posix/issues/710).

View File

@@ -333,10 +333,6 @@ def main():
if not HAS_FIREWALLD:
module.fail_json(msg=missing_required_lib('python-firewall'))
# If you want to show warning messages in the task running process,
# you can append the message to the 'warn' list.
warn = list()
try:
client = fw_client.FirewallClient()
@@ -356,8 +352,7 @@ def main():
collect_zones = list(set(specified_zones) & set(all_zones))
ignore_zones = list(set(specified_zones) - set(collect_zones))
if ignore_zones:
warn.append(
'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones))
module.warn('Please note: zone:(%s) have been ignored in the gathering process.' % ", ".join(ignore_zones))
else:
collect_zones = get_all_zones(client)
@@ -396,7 +391,6 @@ def main():
result['collected_zones'] = collect_zones
result['undefined_zones'] = ignore_zones
result['firewalld_info'] = firewalld_info
result['warnings'] = warn
module.exit_json(**result)

View File

@@ -20,6 +20,7 @@
- name: Assert turn active_zones true
ansible.builtin.assert:
that:
- result.collected_zones == ['public']
- name: Ensure firewalld_zones with zone list
ansible.posix.firewalld_info:
@@ -31,3 +32,6 @@
- name: Assert specified zones
ansible.builtin.assert:
that:
- result.collected_zones == ['public']
- result.undefined_zones == ['invalid_zone']
- '"invalid_zone" in result.warnings[0]'