diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-05-17 17:06:32 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-05-30 20:14:32 +0200 |
| commit | 0c75df4bf3784eae08f41c176bbaab44c6d510a7 (patch) | |
| tree | 2b7c1162a64f95c62e6f8cc642dbb51007cc404c /ipaserver/install/dns.py | |
| parent | da71e7e9de233bc0e40a90adb2db6d0944a1356a (diff) | |
| download | freeipa-0c75df4bf3784eae08f41c176bbaab44c6d510a7.tar.gz freeipa-0c75df4bf3784eae08f41c176bbaab44c6d510a7.tar.xz freeipa-0c75df4bf3784eae08f41c176bbaab44c6d510a7.zip | |
Move check_zone_overlap() from ipapython.ipautil to ipapython.dnsutil
This is preparatory work to avoid (future) cyclic import between
ipapython.dnsutil and ipapython.ipautil.
https://fedorahosted.org/freeipa/ticket/5710
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver/install/dns.py')
| -rw-r--r-- | ipaserver/install/dns.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index ccb7760e3..0fb869a7b 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -118,7 +118,7 @@ def install_check(standalone, api, 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_error=False) + dnsutil.check_zone_overlap(domain, raise_on_error=False) except ValueError as e: if options.force or options.allow_zone_overlap: root_logger.warning("%s Please make sure that the domain is " @@ -129,7 +129,7 @@ def install_check(standalone, api, replica, options, hostname): for reverse_zone in options.reverse_zones: try: - ipautil.check_zone_overlap(reverse_zone) + dnsutil.check_zone_overlap(reverse_zone) except ValueError as e: if options.force or options.allow_zone_overlap: root_logger.warning(e.message) |