On 09/26/2014 11:46 AM, Martin Kosek wrote:
On 09/25/2014 01:24 PM, Martin Kosek wrote:
On 09/24/2014 10:43 AM, Martin Kosek wrote:
On 08/22/2014 06:07 PM, Petr Viktorin wrote:
https://fedorahosted.org/freeipa/ticket/4499
Actually I wonder why we use backup_state/restore_state for these
settings.
Rob, was there a reason for not just always setting nsslapd-port:
389 and
nsslapd-security: on?
This works pretty nicely, I liked the service.py extension.
My test output:
# ipa-ldap-updater --upgrade
Upgrading IPA:
[1/10]: stopping directory server
[2/10]: saving configuration
[3/10]: disabling listeners
[4/10]: starting directory server
[5/10]: preparing server upgrade
PRE_SCHEMA_UPDATE
[6/10]: updating schema
...
[7/10]: upgrading server
[error] ValueError: Ha!
[cleanup]: stopping directory server
[cleanup]: restoring configuration
# ipactl start
# netstat -putna | grep 389
...
tcp6 0 0 10.16.78.147:389 10.16.78.147:37490
ESTABLISHED
5956/ns-slapd
So I am willing to ACK if there are no other objections.
Martin
I read the silence as "no objections", so ACK.
Pushed to:
master: 9a188607fcf68721fc8c38c3c73ee02cac76b58a
ipa-4-1: b333e7adc98ff7c5335fbc7ce1bde5b9dfb3f5ef
Martin
Just found (benign) display issue with this patch when --external-ca is
used. See:
https://fedorahosted.org/freeipa/ticket/4499#comment:4
Martin
You're right. This patch should fix that.
--
Petr³
From 93862732e9c05ce8b96e25daf4c71ae5a1f1fa82 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <[email protected]>
Date: Fri, 26 Sep 2014 12:43:18 +0200
Subject: [PATCH] ipaserver.install.service: Don't show error message on
SystemExit(0)
Additional fix for: https://fedorahosted.org/freeipa/ticket/4499
---
ipaserver/install/service.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index d095fe041bec8098937bf5b99b301a41842ce53e..d2556dccc873d72d9209de379eca86a0b572da29 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -370,14 +370,15 @@ def run_step(message, method):
run_step(full_msg, method)
step += 1
except BaseException as e:
- # show the traceback, so it's not lost if the cleanup method fails
- root_logger.debug("%s" % traceback.format_exc())
- self.print_msg(' [error] %s: %s' % (type(e).__name__, e))
+ if not (isinstance(e, SystemExit) and e.code == 0):
+ # show the traceback, so it's not lost if cleanup method fails
+ root_logger.debug("%s" % traceback.format_exc())
+ self.print_msg(' [error] %s: %s' % (type(e).__name__, e))
- # run through remaining methods marked run_after_failure
- for message, method, run_after_failure in steps_iter:
- if run_after_failure:
- run_step(" [cleanup]: %s" % message, method)
+ # run through remaining methods marked run_after_failure
+ for message, method, run_after_failure in steps_iter:
+ if run_after_failure:
+ run_step(" [cleanup]: %s" % message, method)
raise
--
1.9.3
_______________________________________________
Freeipa-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/freeipa-devel
