From 885da73dbd5ee6ab4fa028249d591951468981fc Mon Sep 17 00:00:00 2001 From: Felipe Barreto Date: Oct 16 2018 07:41:17 +0000 Subject: Fixing tests on TestReplicaManageDel This commit fixes the tests on class TestReplicaManageDel: - test_replica_managed_del_domlevel1 - test_clean_dangling_ruv_multi_ca - test_replica_managed_del_domlevel0 Given that domain level 0 doest not have autodiscovery, we need to configure /etc/resolv.conf with the master data (search and nameserver ) in order to ipa-replica-install succeed. Reviewed-By: Rob Crittenden Reviewed-By: Christian Heimes --- diff --git a/ipatests/pytest_ipa/integration/tasks.py b/ipatests/pytest_ipa/integration/tasks.py index c001ab4..f0467aa 100644 --- a/ipatests/pytest_ipa/integration/tasks.py +++ b/ipatests/pytest_ipa/integration/tasks.py @@ -345,10 +345,25 @@ def master_authoritative_for_client_domain(master, client): raiseonerr=False) return result.returncode == 0 + +def _config_replica_resolvconf_with_master_data(master, replica): + """ + Configure replica /etc/resolv.conf to use master as DNS server + """ + content = ('search {domain}\nnameserver {master_ip}' + .format(domain=master.domain.name, master_ip=master.ip)) + replica.put_file_contents(paths.RESOLV_CONF, content) + + def replica_prepare(master, replica, extra_args=(), raiseonerr=True, stdin_text=None): fix_apache_semaphores(replica) prepare_reverse_zone(master, replica.ip) + + # in domain level 0 there is no autodiscovery, so it's necessary to + # change /etc/resolv.conf to find master DNS server + _config_replica_resolvconf_with_master_data(master, replica) + args = ['ipa-replica-prepare', '-p', replica.config.dirman_password, replica.hostname]