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/server/install.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/server/install.py')
| -rw-r--r-- | ipaserver/install/server/install.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index bd07793bb..a181d8c54 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -1267,10 +1267,11 @@ class Server(BaseServer): "and -a options") if self.setup_dns: #pylint: disable=no-member - if not self.dns.forwarders and not self.dns.no_forwarders: + if (not self.dns.forwarders and not self.dns.no_forwarders + and not self.dns.auto_forwarders): raise RuntimeError( - "You must specify at least one --forwarder option or " - "--no-forwarders option") + "You must specify at least one of --forwarder, " + "--auto-forwarders, or --no-forwarders options") if self.idmax < self.idstart: raise RuntimeError( |