diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-05-17 17:26:20 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-05-30 20:14:32 +0200 |
| commit | dc405005f537cf278fd6ddfe6b87060bd13d9a67 (patch) | |
| tree | e77d279876f8be3e0ead4c298ed32a7cd0da05f7 /ipaserver/install/bindinstance.py | |
| parent | ec49130b94d2aa195c6b704a30fe6c3137fabdbf (diff) | |
| download | freeipa-dc405005f537cf278fd6ddfe6b87060bd13d9a67.tar.gz freeipa-dc405005f537cf278fd6ddfe6b87060bd13d9a67.tar.xz freeipa-dc405005f537cf278fd6ddfe6b87060bd13d9a67.zip | |
Move IP address resolution from ipaserver.install.installutils to ipapython.dnsutil
This is to make it reusable from other modules and to avoid future code
duplication.
https://fedorahosted.org/freeipa/ticket/5710
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver/install/bindinstance.py')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 2a642422a..ec8526a8e 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -908,7 +908,9 @@ class BindInstance(service.Service): if fqdn == self.fqdn: continue - addrs = installutils.resolve_host(fqdn) + addrs = dnsutil.resolve_ip_addresses(fqdn) + # hack, will go away with locations + addrs = [str(addr) for addr in addrs] root_logger.debug("Adding DNS records for master %s" % fqdn) self.__add_master_records(fqdn, addrs) @@ -964,7 +966,9 @@ class BindInstance(service.Service): if dns_zone_exists(zone, self.api): addrs = get_fwd_rr(zone, host, api=self.api) else: - addrs = installutils.resolve_host(fqdn) + addrs = dnsutil.resolve_ip_addresses(fqdn) + # hack, will go away with locations + addrs = [str(addr) for addr in addrs] self.__add_ipa_ca_records(fqdn, addrs, True) @@ -1084,7 +1088,9 @@ class BindInstance(service.Service): if dns_zone_exists(zone, self.api): addrs = get_fwd_rr(zone, host, api=self.api) else: - addrs = installutils.resolve_host(fqdn) + addrs = dnsutil.resolve_ip_addresses(fqdn) + # hack, will go away with locations + addrs = [str(addr) for addr in addrs] self.domain = domain_name @@ -1172,7 +1178,9 @@ class BindInstance(service.Service): if dns_zone_exists(zone, self.api): addrs = get_fwd_rr(zone, host, api=self.api) else: - addrs = installutils.resolve_host(fqdn) + addrs = dnsutil.resolve_ip_addresses(fqdn) + # hack, will go away with locations + addrs = [str(addr) for addr in addrs] for addr in addrs: del_fwd_rr(domain_name, IPA_CA_RECORD, addr, api=self.api) |