mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2026-10-12 16:32:01 -05:00
Replica inst. fix: do not require -r, -a, -p options in unattended mode
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:
1 parent
e2b77f6283
commit
74da4f5870
2 files changed
+6
-7
No files matched your search
@@ -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,)
|
||||
|
||||
@@ -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(
|
||||
|
||||
Reference in new issue
Block a user