summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorFlorence Blanc-Renaud <flo@redhat.com>2016-11-30 16:34:16 +0100
committerMartin Basti <mbasti@redhat.com>2016-12-07 16:53:27 +0100
commit9e3c17c6ded868b4261aa76137c703a4fb866578 (patch)
tree587dbbdb06178a9827a2d0a3ad325964f8e4b65c /ipalib
parenta24cd01304aaef77b66d0e178585c9ec8bbce9b5 (diff)
downloadfreeipa-9e3c17c6ded868b4261aa76137c703a4fb866578.tar.gz
freeipa-9e3c17c6ded868b4261aa76137c703a4fb866578.tar.xz
freeipa-9e3c17c6ded868b4261aa76137c703a4fb866578.zip
Increase the timeout waiting for certificate issuance in installer
During the server installation, the installer requests certificates through certmonger. The current timeout is 60s and is too low. Increase this timeout to api.env.startup_timeout as done in ipa_cacert_manage or ipa_certupdate.py (the code checks the status each 5s up to the timeout value). https://fedorahosted.org/freeipa/ticket/6433 Reviewed-By: Martin Basti <mbasti@redhat.com> Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/install/certmonger.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipalib/install/certmonger.py b/ipalib/install/certmonger.py
index 3ea900b18..c79cf9383 100644
--- a/ipalib/install/certmonger.py
+++ b/ipalib/install/certmonger.py
@@ -30,6 +30,7 @@ import dbus
import shlex
import subprocess
import tempfile
+from ipalib import api
from ipapython.ipa_log_manager import root_logger
from ipaplatform.paths import paths
from ipaplatform import services
@@ -309,7 +310,7 @@ def request_and_wait_for_cert(
reqId = request_cert(nssdb, nickname, subject, principal,
passwd_fname, dns, ca, profile,
pre_command, post_command)
- state = wait_for_request(reqId, timeout=60)
+ state = wait_for_request(reqId, api.env.startup_timeout)
ca_error = get_request_value(reqId, 'ca-error')
if state != 'MONITORING' or ca_error:
raise RuntimeError("Certificate issuance failed ({})".format(state))