diff options
| author | Martin Basti <mbasti@redhat.com> | 2016-02-23 10:37:47 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-02-23 17:35:20 +0100 |
| commit | 0accf8ccb64963954dbe7c137d23f52e5901ac4f (patch) | |
| tree | dc3be8b5d65f3fff5a1966aa7b7ee2902023c13f | |
| parent | c96822f3e5af57f5f1f062a957778c84ad2b520d (diff) | |
| download | freeipa-0accf8ccb64963954dbe7c137d23f52e5901ac4f.tar.gz freeipa-0accf8ccb64963954dbe7c137d23f52e5901ac4f.tar.xz freeipa-0accf8ccb64963954dbe7c137d23f52e5901ac4f.zip | |
fix upgrade: wait for proper DS socket after DS restart
DS restart executed by upgrade plugin causes that upgrade framework
is waiting for the improper socket. It leads to TimeoutError because
DS is not listening on 389 port during upgrade. This commit fixes the issue.
Required for: https://fedorahosted.org/freeipa/ticket/5665
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
| -rw-r--r-- | ipaserver/install/ldapupdate.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 95e35f697..32fa4e25b 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -43,7 +43,6 @@ from ipaplatform.paths import paths from ipaplatform import services from ipapython.dn import DN from ipapython.ipa_log_manager import log_mgr -from ipapython.ipautil import wait_for_open_socket if six.PY3: unicode = str @@ -945,5 +944,4 @@ class LDAPUpdate: def restart_ds(self): dirsrv = services.knownservices.dirsrv self.log.debug('Restarting directory server to apply updates') - dirsrv.restart() - wait_for_open_socket(self.socket_name) + dirsrv.restart(ldapi=self.ldapi) |