diff options
| author | Petr Spacek <pspacek@redhat.com> | 2015-12-16 13:37:39 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2015-12-16 15:25:53 +0100 |
| commit | 58331208a5ded367e521d42d99de2835f329fab7 (patch) | |
| tree | a7d55a992523207543ea9bc50b0fdbbaf5248005 /ipaserver/install/dns.py | |
| parent | c265e8736e51d5b4fede94a414d83b3e0ada2853 (diff) | |
| download | freeipa-58331208a5ded367e521d42d99de2835f329fab7.tar.gz freeipa-58331208a5ded367e521d42d99de2835f329fab7.tar.xz freeipa-58331208a5ded367e521d42d99de2835f329fab7.zip | |
dns: Handle SERVFAIL in check if domain already exists.
In cases where domain is already delegated to IPA prior installation
we might get timeout or SERVFAIL. The answer depends on the recursive
server we are using for the check.
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/install/dns.py')
| -rw-r--r-- | ipaserver/install/dns.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index 94e9017b6..763b2aca4 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -126,10 +126,12 @@ def install_check(standalone, replica, options, hostname): domain = dnsutil.DNSName(util.normalize_zone(api.env.domain)) print("Checking DNS domain %s, please wait ..." % domain) try: - ipautil.check_zone_overlap(domain, raise_on_timeout=False) + ipautil.check_zone_overlap(domain, raise_on_error=False) except ValueError as e: if options.force or options.allow_zone_overlap: - root_logger.warning(e.message) + root_logger.warning("%s Please make sure that the domain is " + "properly delegated to this IPA server.", + e.message) else: raise e |