From 7f19fda0d1fbd4431b0bd704f5c242e499e66e98 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Jun 11 2020 19:18:09 +0000 Subject: ipatests: fix the disable_dnssec_validation method Bind configuration now includes 2 snippet config files, in /etc/named/ipa-ext.conf and /etc/named/ipa-options-ext.conf When a test needs to disable dnssec-validation, it needs to edit the snippet ipa-options-ext.conf instead of /etc/named.conf. This commit fixes the method tasks.disable_dnssec_validation so that it correctly updates the snippet. Fixes: https://pagure.io/freeipa/issue/8364 Reviewed-By: Christian Heimes Reviewed-By: Alexander Bokovoy --- diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py index 5909e16..2ffaceb 100755 --- a/ipatests/pytest_ipa/integration/tasks.py +++ b/ipatests/pytest_ipa/integration/tasks.py @@ -531,11 +531,14 @@ def install_adtrust(host): def disable_dnssec_validation(host): - backup_file(host, paths.NAMED_CONF) - named_conf = host.get_file_contents(paths.NAMED_CONF) + """ + Edits ipa-options-ext.conf snippet in order to disable dnssec validation + """ + backup_file(host, paths.NAMED_CUSTOM_OPTIONS_CONF) + named_conf = host.get_file_contents(paths.NAMED_CUSTOM_OPTIONS_CONF) named_conf = re.sub(br'dnssec-validation\s*yes;', b'dnssec-validation no;', named_conf) - host.put_file_contents(paths.NAMED_CONF, named_conf) + host.put_file_contents(paths.NAMED_CUSTOM_OPTIONS_CONF, named_conf) restart_named(host)