IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

installer: update time estimates

Browse Source 
Time estimates have been updated to be more accurate. Only
tasks that are estimated to take longer than 10 seconds have
the estimate displayed.

https://pagure.io/freeipa/issue/6596

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
This commit is contained in:
Tomas Krizek
2017-03-01 17:35:56 +01:00
committed by Martin Basti
parent c37254e1b1
commit 09c6b75780
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ipaserver/install/cainstance.py
View File

@@ -450,8 +450,13 @@ class CAInstance(DogtagInstance):
self.step("configuring certmonger renewal for lightweight CAs", self.step("configuring certmonger renewal for lightweight CAs",
self.__add_lightweight_ca_tracking_requests) self.__add_lightweight_ca_tracking_requests)
if ra_only:
runtime = None
else:
runtime = 180
try: try:
self.start_creation(runtime=210) self.start_creation(runtime=runtime)
finally: finally:
self.clean_pkispawn_files() self.clean_pkispawn_files()

6
ipaserver/install/dsinstance.py
View File

@@ -350,7 +350,7 @@ class DsInstance(service.Service):
self.__common_post_setup() self.__common_post_setup()
self.start_creation(runtime=60) self.start_creation(runtime=30)
def enable_ssl(self): def enable_ssl(self):
self.steps = [] self.steps = []
@@ -359,7 +359,7 @@ class DsInstance(service.Service):
self.step("restarting directory server", self.__restart_instance) self.step("restarting directory server", self.__restart_instance)
self.step("adding CA certificate entry", self.__upload_ca_cert) self.step("adding CA certificate entry", self.__upload_ca_cert)
self.start_creation(runtime=10) self.start_creation()
def create_replica(self, realm_name, master_fqdn, fqdn, def create_replica(self, realm_name, master_fqdn, fqdn,
domain_name, dm_password, domain_name, dm_password,
@@ -412,7 +412,7 @@ class DsInstance(service.Service):
self.__common_post_setup() self.__common_post_setup()
self.start_creation(runtime=60) self.start_creation(runtime=30)
def __setup_replica(self): def __setup_replica(self):

2
ipaserver/install/httpinstance.py
View File

@@ -185,7 +185,7 @@ class HTTPInstance(service.Service):
self.step("configuring httpd to start on boot", self.__enable) self.step("configuring httpd to start on boot", self.__enable)
self.step("enabling oddjobd", self.enable_and_start_oddjobd) self.step("enabling oddjobd", self.enable_and_start_oddjobd)
self.start_creation(runtime=60) self.start_creation()
def __start(self): def __start(self):
self.backup_state("running", self.is_running()) self.backup_state("running", self.is_running())

2
ipaserver/install/krainstance.py
View File

@@ -132,7 +132,7 @@ class KRAInstance(DogtagInstance):
self.step("enabling KRA instance", self.__enable_instance) self.step("enabling KRA instance", self.__enable_instance)
try: try:
self.start_creation(runtime=126) self.start_creation(runtime=120)
finally: finally:
self.clean_pkispawn_files() self.clean_pkispawn_files()

4
ipaserver/install/krbinstance.py
View File

@@ -164,7 +164,7 @@ class KrbInstance(service.Service):
self.step("installing X509 Certificate for PKINIT", self.step("installing X509 Certificate for PKINIT",
self.setup_pkinit) self.setup_pkinit)
self.start_creation(runtime=30) self.start_creation()
self.kpasswd = KpasswdInstance() self.kpasswd = KpasswdInstance()
self.kpasswd.create_instance('KPASSWD', self.fqdn, self.suffix, self.kpasswd.create_instance('KPASSWD', self.fqdn, self.suffix,
@@ -189,7 +189,7 @@ class KrbInstance(service.Service):
self.__common_post_setup() self.__common_post_setup()
self.start_creation(runtime=30) self.start_creation()
self.kpasswd = KpasswdInstance() self.kpasswd = KpasswdInstance()
self.kpasswd.create_instance('KPASSWD', self.fqdn, self.suffix) self.kpasswd.create_instance('KPASSWD', self.fqdn, self.suffix)

4
ipaserver/install/service.py
View File

@@ -365,7 +365,7 @@ class Service(object):
self.steps.append((message, method, run_after_failure)) self.steps.append((message, method, run_after_failure))
def start_creation(self, start_message=None, end_message=None, def start_creation(self, start_message=None, end_message=None,
show_service_name=True, runtime=-1): show_service_name=True, runtime=None):
""" """
Starts creation of the service. Starts creation of the service.
@@ -401,7 +401,7 @@ class Service(object):
else: else:
end_message = "Done configuring %s." % self.service_desc end_message = "Done configuring %s." % self.service_desc
if runtime > 0: if runtime is not None and runtime > 0:
self.print_msg('%s. Estimated time: %s' % (start_message, self.print_msg('%s. Estimated time: %s' % (start_message,
format_seconds(runtime))) format_seconds(runtime)))
else: else:

3
ipaserver/install/upgradeinstance.py
View File

@@ -120,7 +120,8 @@ class IPAUpgrade(service.Service):
if ds_running: if ds_running:
self.step("starting directory server", self.__start) self.step("starting directory server", self.__start)
self.start_creation(start_message="Upgrading IPA:", self.start_creation(start_message="Upgrading IPA:",
show_service_name=False) show_service_name=False,
runtime=90)
def __save_config(self): def __save_config(self):
shutil.copy2(self.filename, self.savefilename) shutil.copy2(self.filename, self.savefilename)