IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replica inst. fix: do not require -r, -a, -p options in unattended mode

Browse Source 
Previous patches for this ticket introduced error, that replica install
requires to specify -r, -p and -a option in unattended mode.
This options are not needed on replica side.

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

Reviewed-By: Milan Kubík <mkubik@redhat.com>
This commit is contained in:
Martin Basti 2015-09-23 15:48:30 +02:00
parent e2b77f6283
commit 74da4f5870
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,13 +348,6 @@ class BaseServer(common.Installable, common.Interactive, core.Composite):
#pylint: disable=no-member
if not self.uninstalling and not self.interactive:
if (not self.realm_name or not self.dm_password or
not self.admin_password):
raise RuntimeError(
"In unattended mode you need to provide at least -r, -p "
"and -a options")
# If any of the key file options are selected, all are required.
cert_file_req = (self.ca.dirsrv_cert_files, self.ca.http_cert_files)
cert_file_opt = (self.ca.pkinit_cert_files,)

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

@ -1263,6 +1263,12 @@ class Server(BaseServer):
self.master_password):
raise RuntimeError(
"In uninstall mode, -a, -r and -P options are not allowed")
elif not self.interactive:
if (not self.realm_name or not self.dm_password or
not self.admin_password):
raise RuntimeError(
"In unattended mode you need to provide at least -r, -p "
"and -a options")
if self.idmax < self.idstart:
raise RuntimeError(