diff --git a/changelogs/fragments/678-firewalld-info-dbus-error.yml b/changelogs/fragments/678-firewalld-info-dbus-error.yml new file mode 100644 index 0000000..d7ebb80 --- /dev/null +++ b/changelogs/fragments/678-firewalld-info-dbus-error.yml @@ -0,0 +1,4 @@ +bugfixes: + - firewalld_info - return a module failure instead of a traceback when python-firewall raises + ``FirewallError``, for example when D-Bus is unavailable + (https://github.com/ansible-collections/ansible.posix/issues/678). diff --git a/plugins/modules/firewalld_info.py b/plugins/modules/firewalld_info.py index 8c5536e..8da91ad 100644 --- a/plugins/modules/firewalld_info.py +++ b/plugins/modules/firewalld_info.py @@ -224,9 +224,11 @@ except ImportError: try: import firewall.client as fw_client import firewall.config as fw_config + import firewall.errors as fw_errors HAS_FIREWALLD = True except ImportError: HAS_FIREWALLD = False + fw_errors = None def get_version(): @@ -387,6 +389,8 @@ def main(): module.fail_json(msg=('Unable to gather firewalld settings.' ' You may need to run as the root user or' ' use become. (Error: %s)' % to_native(e))) + except fw_errors.FirewallError as e: + module.fail_json(msg='Unable to gather firewalld settings. (Error: %s)' % to_native(e)) result['collected_zones'] = collect_zones result['undefined_zones'] = ignore_zones