From 50fc1d1454207b04208427a7cd2b3e92a9bf7632 Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:42:47 +0200 Subject: [PATCH 1/6] warn only when zones were ignored --- plugins/modules/firewalld_info.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/modules/firewalld_info.py b/plugins/modules/firewalld_info.py index 334518d..09d337b 100644 --- a/plugins/modules/firewalld_info.py +++ b/plugins/modules/firewalld_info.py @@ -349,8 +349,9 @@ def main(): specified_zones = module.params['zones'] collect_zones = list(set(specified_zones) & set(all_zones)) ignore_zones = list(set(specified_zones) - set(collect_zones)) - warn.append( - 'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones)) + if ignore_zones: + warn.append( + 'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones)) else: collect_zones = get_all_zones(client) From f87aab8ce21f6cd996b6886253c0c470f99fac3e Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:27:46 +0200 Subject: [PATCH 2/6] add changelog 504-firewalld_info-warning --- changelogs/fragments/504-firewalld_info-warning | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/504-firewalld_info-warning diff --git a/changelogs/fragments/504-firewalld_info-warning b/changelogs/fragments/504-firewalld_info-warning new file mode 100644 index 0000000..1b55339 --- /dev/null +++ b/changelogs/fragments/504-firewalld_info-warning @@ -0,0 +1,2 @@ +trivial: + - "Only warn about ignored zones in firewalld_info, when there are zones ignored (https://github.com/ansible-collections/ansible.posix/pull/504)." From 1efe507ee7289903c4fb3b55de384144702a4d9f Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:53:53 +0200 Subject: [PATCH 3/6] update changelog --- changelogs/fragments/504-firewalld_info-warning | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelogs/fragments/504-firewalld_info-warning b/changelogs/fragments/504-firewalld_info-warning index 1b55339..521f13f 100644 --- a/changelogs/fragments/504-firewalld_info-warning +++ b/changelogs/fragments/504-firewalld_info-warning @@ -1,2 +1,3 @@ +--- trivial: - - "Only warn about ignored zones in firewalld_info, when there are zones ignored (https://github.com/ansible-collections/ansible.posix/pull/504)." + - Only warn about ignored zones in firewalld_info, when there are zones ignored From 69dc514d2b060ba32cc259562f1c873a587e40b2 Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sun, 29 Oct 2023 11:39:37 +0100 Subject: [PATCH 4/6] Update 504-firewalld_info-warning --- changelogs/fragments/504-firewalld_info-warning | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/changelogs/fragments/504-firewalld_info-warning b/changelogs/fragments/504-firewalld_info-warning index 521f13f..1a13a62 100644 --- a/changelogs/fragments/504-firewalld_info-warning +++ b/changelogs/fragments/504-firewalld_info-warning @@ -1,3 +1,2 @@ ---- -trivial: +minor_changes: - Only warn about ignored zones in firewalld_info, when there are zones ignored From 9f06500fc71e9135b6cf9e7def62befc10c3944f Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sat, 16 Dec 2023 17:53:08 +0100 Subject: [PATCH 5/6] adjust change log fragment --- changelogs/fragments/504-firewalld_info-warning | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/504-firewalld_info-warning b/changelogs/fragments/504-firewalld_info-warning index 1a13a62..73e00aa 100644 --- a/changelogs/fragments/504-firewalld_info-warning +++ b/changelogs/fragments/504-firewalld_info-warning @@ -1,2 +1,2 @@ minor_changes: - - Only warn about ignored zones in firewalld_info, when there are zones ignored + - firewalld_info - Only warn about ignored zones, when there are zones ignored. From b628d71ad496e774470b70973de516b66d85c72b Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sat, 16 Dec 2023 18:03:58 +0100 Subject: [PATCH 6/6] add filename extension to changelog --- ...504-firewalld_info-warning => 504-firewalld_info-warning.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelogs/fragments/{504-firewalld_info-warning => 504-firewalld_info-warning.yaml} (100%) diff --git a/changelogs/fragments/504-firewalld_info-warning b/changelogs/fragments/504-firewalld_info-warning.yaml similarity index 100% rename from changelogs/fragments/504-firewalld_info-warning rename to changelogs/fragments/504-firewalld_info-warning.yaml