diff options
author | Rob Crittenden <rcritten@redhat.com> | 2012-05-24 11:23:36 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-07-02 17:08:58 -0400 |
commit | e5b6260008a3a7132fdaef99d800406eb8872316 (patch) | |
tree | 9981186bd06f5574570f5743cba05cd0aa9ee963 /ipaserver/install/plugins/updateclient.py | |
parent | 6fb802152add24aa1842f4adccf59b23850ab336 (diff) | |
download | freeipa.git-e5b6260008a3a7132fdaef99d800406eb8872316.tar.gz freeipa.git-e5b6260008a3a7132fdaef99d800406eb8872316.tar.xz freeipa.git-e5b6260008a3a7132fdaef99d800406eb8872316.zip |
Centralize timeout for waiting for servers to start.
All service start/restart currently go through ipapython/platform so
move the "wait for service to start" code there as well.
A dictionary of known services and ports to wait on is defined in base.py
This is referenced by the platforms by instance name to determine what
to wait for. For the case of dirsrv if we get that as a plain name
(no specific instance) it is assumed to be the main IPA service.
https://fedorahosted.org/freeipa/ticket/2375
https://fedorahosted.org/freeipa/ticket/2610
Diffstat (limited to 'ipaserver/install/plugins/updateclient.py')
-rw-r--r-- | ipaserver/install/plugins/updateclient.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/plugins/updateclient.py b/ipaserver/install/plugins/updateclient.py index 10d899ab..e2376947 100644 --- a/ipaserver/install/plugins/updateclient.py +++ b/ipaserver/install/plugins/updateclient.py @@ -18,11 +18,11 @@ # import os -from ipaserver.install import installutils from ipaserver.install.plugins import FIRST, MIDDLE, LAST from ipaserver.install.plugins import POST_UPDATE from ipaserver.install.plugins.baseupdate import DSRestart from ipaserver.install.ldapupdate import LDAPUpdate +from ipapython.ipautil import wait_for_open_socket from ipalib import api from ipalib import backend import ldap as _ldap @@ -161,7 +161,7 @@ class updateclient(backend.Executioner): if live_run: self.destroy_context() dsrestart.create_instance() - installutils.wait_for_open_socket(socket_name) + wait_for_open_socket(socket_name) self.create_context(dm_password) else: self.log.warn("Test mode, skipping restart") |