On 09/22/2015 12:10 PM, Jan Cholasta wrote:
On 22.9.2015 10:29, Martin Babinsky wrote:
On 09/16/2015 10:44 AM, Jan Cholasta wrote:
On 16.9.2015 08:11, Jan Cholasta wrote:
On 15.9.2015 07:22, Jan Cholasta wrote:
On 10.8.2015 16:58, Martin Babinsky wrote:
On 08/06/2015 08:22 AM, Jan Cholasta wrote:
Hi,

the attached patch fixes part of
<https://fedorahosted.org/freeipa/ticket/4517>.

See also Martin Babinsky's patch 51:
<https://www.redhat.com/archives/freeipa-devel/2015-August/msg00012.html>.






Honza


Sorry but NACK, see below:

1.) it seems that passing kwargs to Server components doesn't work as
expected. See these logs (install on fresh F22 VM):

http://fpaste.org/253416/21363814/
http://fpaste.org/253419/43921374/

Fixed.


2.) the following code blows up in BaseServers' __init__:
(http://fpaste.org/253400/21225314/)

392         if not self.dns.setup_dns:
393             if self.dns.forwarders:
394                 raise RuntimeError(
395                     "You cannot specify a --forwarder option
without
the "
396                     "--setup-dns option")


I think that the check should be:

392         if not self.setup_dns:
393             if self.dns.forwarders:

Fixed.


IMHO BaseServerDNS class shouldn't have setup_dns knob, that should be
set in the parent class (BaseServer)

Fixed.


3.) Is there any reason why BaseServer doesn't have 'master_password', 'idmax' and 'idstart' knobs? I know that these are then brought in by
the derived Server class, but the check for them is in parent's
__init__() method and it is IMHO a bit confusing

The check should be in Server, fixed.


4.) please add license header to the beginning of
'ipaserver/install/server/common.py' file

Added.

Updated patches attached.

Self-NACK, I broke ipa-server-install --uninstall.

Fixed.


ACK to all three patches.


Thanks.

Pushed to:
master: 86edd6abeb9749e159a529b83cfce6443fff4ba5
ipa-4-2: 42d16b02cd153ac89ebd8ae07c98611dc3b6e471

These patches introduced regression.
ipa-replica-install in unattended mode requires to specify -a, -p and -r options.

Attached patch fixes it.

From ff5c1247520ad2d97047d28cc3f94e76faf55301 Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Wed, 23 Sep 2015 15:48:30 +0200
Subject: [PATCH] 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
---
 ipaserver/install/server/common.py  | 7 -------
 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 e7fb2acfc0eb36547f175fef51fcb5c7f5764269..0648b40e550309195f7bc88e2f5f29af4139d5d5 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 9137e1a9b0cd77803fefaf60db82606eafa42d76..4fe1ed9f25206e7c014e544fcc3e71243e685f86 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(
-- 
2.4.3

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to