summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2015-10-12 14:58:40 +0200
committerJan Cholasta <jcholast@redhat.com>2015-10-12 15:51:14 +0200
commit61bdbd6e47b2cd2a62f7e50a6a6cbd2e272470d9 (patch)
tree794fa7b6c6ee40e05613c46b32ba3988a9a28fd9
parent275e1482de279081ca90ee2951bf379fbdab887f (diff)
downloadfreeipa-61bdbd6e47b2cd2a62f7e50a6a6cbd2e272470d9.tar.gz
freeipa-61bdbd6e47b2cd2a62f7e50a6a6cbd2e272470d9.tar.xz
freeipa-61bdbd6e47b2cd2a62f7e50a6a6cbd2e272470d9.zip
upgrade: make sure ldap2 is connected in export_kra_agent_pem
https://fedorahosted.org/freeipa/ticket/5360 Reviewed-By: Ales 'alich' Marecek <amarecek@redhat.com>
-rw-r--r--ipaserver/install/server/upgrade.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
index 5d3972b97..32ea31b1b 100644
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -1258,6 +1258,13 @@ def export_kra_agent_pem():
root_logger.info("KRA agent PEM file already exported")
return
+ if not api.Backend.ldap2.isconnected():
+ try:
+ api.Backend.ldap2.connect(autobind=True)
+ except ipalib.errors.PublicError as e:
+ root_logger.error("Cannot connect to LDAP: %s", e)
+ return
+
if not api.Command.kra_is_enabled()['result']:
root_logger.info("KRA is not enabled")
return