From 4254423f8315ac88b0400b261e3b0e4acf015db6 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 26 Jun 2014 13:00:32 +0200 Subject: ipatests: tasks: Fix dns configuration for trusts Properly configure forwarders to the AD zone with respect to newly created ipa dnsforwardzone commands. https://fedorahosted.org/freeipa/ticket/4401 Reviewed-By: Petr Spacek --- ipatests/test_integration/tasks.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index cd8f98306..4ed4662a0 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -315,15 +315,7 @@ def configure_dns_for_trust(master, ad): kinit_admin(master) - if is_subdomain(master.domain.name, ad.domain.name): - master.run_command(['ipa', 'dnszone-add', ad.domain.name, - '--name-server', ad.hostname, - '--admin-email', 'hostmaster@%s' % ad.domain.name, - '--forwarder', ad.ip, - '--forward-policy', 'only', - '--ip-address', ad.ip, - '--force']) - elif is_subdomain(ad.domain.name, master.domain.name): + if is_subdomain(ad.domain.name, master.domain.name): master.run_command(['ipa', 'dnsrecord-add', master.domain.name, '%s.%s' % (ad.shortname, ad.netbios), '--a-ip-address', ad.ip]) @@ -336,13 +328,10 @@ def configure_dns_for_trust(master, ad): master.run_command(['ipa', 'dnszone-mod', master.domain.name, '--allow-transfer', ad.ip]) else: - master.run_command(['ipa', 'dnszone-add', ad.domain.name, - '--name-server', ad.hostname, - '--admin-email', 'hostmaster@%s' % ad.domain.name, + master.run_command(['ipa', 'dnsforwardzone-add', ad.domain.name, '--forwarder', ad.ip, '--forward-policy', 'only', - '--ip-address', ad.ip, - '--force']) + ]) def establish_trust_with_ad(master, ad, extra_args=()): -- cgit