summaryrefslogtreecommitdiffstats
path: root/ipaserver/plugins
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2012-10-23 14:07:13 -0400
committerRob Crittenden <rcritten@redhat.com>2012-11-01 13:36:52 -0400
commit1c7261773b5190ec17c7d161a83e00a979c54076 (patch)
tree299d7a1febe1a2a010f782b46f6c97b15169f7e8 /ipaserver/plugins
parent7f272a39b6b46fac1d548b759f671b75592af7a0 (diff)
downloadfreeipa-1c7261773b5190ec17c7d161a83e00a979c54076.tar.gz
freeipa-1c7261773b5190ec17c7d161a83e00a979c54076.tar.xz
freeipa-1c7261773b5190ec17c7d161a83e00a979c54076.zip
Wait for the directory server to come up when updating the agent certificate.
It is possible that either or both of the LDAP instances are being restarted during the renewal process. Make the script retry if this is the case. It is also safe to re-run this script if it fails. It will take the current ipaCert certificate and attempt to update the agent information in LDAP. https://fedorahosted.org/freeipa/ticket/3179
Diffstat (limited to 'ipaserver/plugins')
-rw-r--r--ipaserver/plugins/ldap2.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py
index 519f4613a..bf1a0d376 100644
--- a/ipaserver/plugins/ldap2.py
+++ b/ipaserver/plugins/ldap2.py
@@ -724,6 +724,9 @@ class ldap2(CrudBackend):
raise errors.BadSearchFilter(info=info)
except _ldap.NOT_ALLOWED_ON_NONLEAF:
raise errors.NotAllowedOnNonLeaf()
+ except _ldap.SERVER_DOWN:
+ raise NetworkError(uri=self.ldap_uri,
+ error=u'LDAP Server Down')
except _ldap.SUCCESS:
pass
except _ldap.LDAPError, e: