IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-01 11:47:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

install: fix ipa-server-install fail on missing --forwarder

Browse Source 
https://fedorahosted.org/freeipa/ticket/4517

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Jan Cholasta 2015-10-01 11:41:39 +02:00 committed by Martin Basti
parent 03d696f224
commit 6067824be4
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipaserver/install/server/common.py
View File

@ -401,10 +401,6 @@ class BaseServer(common.Installable, common.Interactive, core.Composite):
raise RuntimeError( raise RuntimeError(
"You cannot specify a --forwarder option together with " "You cannot specify a --forwarder option together with "
"--no-forwarders") "--no-forwarders")
elif not self.dns.forwarders and not self.dns.no_forwarders:
raise RuntimeError(
"You must specify at least one --forwarder option or "
"--no-forwarders option")
elif self.dns.reverse_zones and self.dns.no_reverse: elif self.dns.reverse_zones and self.dns.no_reverse:
raise RuntimeError( raise RuntimeError(
"You cannot specify a --reverse-zone option together with " "You cannot specify a --reverse-zone option together with "

6
ipaserver/install/server/install.py
View File

@ -1269,6 +1269,12 @@ class Server(BaseServer):
raise RuntimeError( raise RuntimeError(
"In unattended mode you need to provide at least -r, -p " "In unattended mode you need to provide at least -r, -p "
"and -a options") "and -a options")
if self.setup_dns:
#pylint: disable=no-member
if not self.dns.forwarders and not self.dns.no_forwarders:
raise RuntimeError(
"You must specify at least one --forwarder option or "
"--no-forwarders option")
if self.idmax < self.idstart: if self.idmax < self.idstart:
raise RuntimeError( raise RuntimeError(

7
ipaserver/install/server/replicainstall.py
View File

@ -741,6 +741,13 @@ class Replica(BaseServer):
raise RuntimeError( raise RuntimeError(
"Replica file %s does not exist" % self.replica_file) "Replica file %s does not exist" % self.replica_file)
if self.setup_dns:
#pylint: disable=no-member
if not self.dns.forwarders and not self.dns.no_forwarders:
raise RuntimeError(
"You must specify at least one --forwarder option or "
"--no-forwarders option")
self.password = self.dm_password self.password = self.dm_password
@step() @step()