diff options
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 7 | ||||
| -rw-r--r-- | ipaserver/install/replication.py | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 554126434..38195c72c 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -427,6 +427,13 @@ class DsInstance(service.Service): def init_memberof(self): self._ldap_mod("memberof-task.ldif", self.sub_dict) + # Note, keep dn in sync with dn in install/share/memberof-task.ldif + dn = "cn=IPA install %s,cn=memberof task,cn=tasks,cn=config" % self.sub_dict["TIME"] + logging.debug("Waiting for memberof task to complete.") + conn = ipaldap.IPAdmin("127.0.0.1") + conn.simple_bind_s("cn=directory manager", self.dm_password) + conn.checkTask(dn, dowait=True) + conn.unbind() def apply_updates(self): ld = ldapupdate.LDAPUpdate(dm_password=self.dm_password, sub_dict=self.sub_dict) diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 1dc112b27..3712d1c3e 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -23,6 +23,7 @@ import os import ldap from ipaserver import ipaldap from ipaserver.install.service import restart +import installutils from ldap import modlist from ipalib import util from ipalib import errors @@ -69,6 +70,7 @@ def enable_replication_version_checking(hostname, realm, dirman_passwd): conn.unbind() serverid = "-".join(realm.split(".")) restart("dirsrv", instance_name=serverid) + installutils.wait_for_open_ports('localhost', [389, 636], 300) else: conn.unbind() |