From fe439dbe4d8c5d5e3d4994c3adff52cfb29cae45 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 20 Aug 2024 07:28:35 -0600 Subject: [PATCH] test: use is-active instead of is-enabled to check for firewalld Need to test if firewalld is running - the is-active test is for that, not is-enabled Signed-off-by: Rich Megginson --- tests/tasks/create_test_interfaces_with_dhcp.yml | 2 +- tests/tasks/remove_test_interfaces_with_dhcp.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tasks/create_test_interfaces_with_dhcp.yml b/tests/tasks/create_test_interfaces_with_dhcp.yml index bc810b4..110353e 100644 --- a/tests/tasks/create_test_interfaces_with_dhcp.yml +++ b/tests/tasks/create_test_interfaces_with_dhcp.yml @@ -120,7 +120,7 @@ ip link set {{ dhcp_interface1 }}p master testbr ip link set {{ dhcp_interface2 }}p master testbr # Run joint DHCP4/DHCP6 server with RA enabled in veth namespace - if systemctl is-enabled firewalld; then + if systemctl is-active firewalld; then for service in dhcp dhcpv6 dhcpv6-client; do if ! firewall-cmd --query-service="$service"; then firewall-cmd --add-service "$service" diff --git a/tests/tasks/remove_test_interfaces_with_dhcp.yml b/tests/tasks/remove_test_interfaces_with_dhcp.yml index 9403b54..44a8d9f 100644 --- a/tests/tasks/remove_test_interfaces_with_dhcp.yml +++ b/tests/tasks/remove_test_interfaces_with_dhcp.yml @@ -32,7 +32,7 @@ service radvd stop iptables -D INPUT -i testbr -p udp --dport 67:68 --sport 67:68 -j ACCEPT fi - if systemctl is-enabled firewalld; then + if systemctl is-active firewalld; then for service in dhcp dhcpv6 dhcpv6-client; do if firewall-cmd --query-service="$service"; then firewall-cmd --remove-service "$service"