ipatests integration/tasks.py: Honor clean for firewall in uninstall_master

This fix will make sure that the firewall services are only cleaned up if
the clean flag is True for example for backup and restore tests where the
clean flag is set to False for the server uninstall.

See: https://pagure.io/freeipa/issue/7755
Signed-off-by: Thomas Woerner <twoerner@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Thomas Woerner 2018-12-04 12:03:52 +01:00 committed by Christian Heimes
parent a0e09526b3
commit 228d1c81c0

View File

@ -793,6 +793,7 @@ def uninstall_master(host, ignore_topology_disconnect=True,
result = host.run_command(uninstall_cmd) result = host.run_command(uninstall_cmd)
assert "Traceback" not in result.stdout_text assert "Traceback" not in result.stdout_text
if clean:
Firewall(host).disable_services(["freeipa-ldap", "freeipa-ldaps", Firewall(host).disable_services(["freeipa-ldap", "freeipa-ldaps",
"freeipa-trust", "dns"]) "freeipa-trust", "dns"])