diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-09-23 15:48:30 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-09-29 15:12:43 +0200 |
| commit | 74da4f5870edda85039b3bba52fb0a578676fb44 (patch) | |
| tree | 53a1bc41705643949c76b915a2f8dd566f1607b0 | |
| parent | e2b77f6283743cd339a47f002d9fe673bcfb70e3 (diff) | |
| download | freeipa-74da4f5870edda85039b3bba52fb0a578676fb44.tar.gz freeipa-74da4f5870edda85039b3bba52fb0a578676fb44.tar.xz freeipa-74da4f5870edda85039b3bba52fb0a578676fb44.zip | |
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>
| -rw-r--r-- | ipaserver/install/server/common.py | 7 | ||||
| -rw-r--r-- | ipaserver/install/server/install.py | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ipaserver/install/server/common.py b/ipaserver/install/server/common.py index e7fb2acfc..0648b40e5 100644 --- a/ipaserver/install/server/common.py +++ b/ipaserver/install/server/common.py @@ -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,) diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 9137e1a9b..4fe1ed9f2 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -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( |