diff options
| author | Petr Spacek <pspacek@redhat.com> | 2015-11-10 11:22:43 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-12-01 10:19:25 +0100 |
| commit | 45d9d4e8ae524cdc91effc05ce3fe1c06cfb750e (patch) | |
| tree | e8139e3c8e2d8a73774760524e4831d3c5e1d4cb /ipaserver/install/dns.py | |
| parent | fa62480c73ccb860c8c8b4cd110b0782eb4883d5 (diff) | |
| download | freeipa-45d9d4e8ae524cdc91effc05ce3fe1c06cfb750e.tar.gz freeipa-45d9d4e8ae524cdc91effc05ce3fe1c06cfb750e.tar.xz freeipa-45d9d4e8ae524cdc91effc05ce3fe1c06cfb750e.zip | |
ipa-dns-install offer IP addresses from resolv.conf as default forwarders
In non-interactive more option --auto-forwarders can be used to do the
same. --forward option can be used to supply additional IP addresses.
https://fedorahosted.org/freeipa/ticket/5438
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaserver/install/dns.py')
| -rw-r--r-- | ipaserver/install/dns.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index 615bd557b..6c8e952f4 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -2,8 +2,11 @@ # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # +from __future__ import absolute_import from __future__ import print_function +# absolute import is necessary because IPA module dns clashes with python-dns +from dns import resolver import sys from subprocess import CalledProcessError @@ -230,8 +233,13 @@ def install_check(standalone, replica, options, hostname): if options.no_forwarders: dns_forwarders = () - elif options.forwarders: - dns_forwarders = options.forwarders + elif options.forwarders or options.auto_forwarders: + if options.forwarders: + dns_forwarders = options.forwarders + else: + dns_forwarders = [] + if options.auto_forwarders: + dns_forwarders += resolver.get_default_resolver().nameservers elif standalone or not replica: dns_forwarders = read_dns_forwarders() |