From 7ce6c4a2d3920f502b9f02e841a651bd0819915b Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 11 Oct 2012 03:32:17 -0400 Subject: Make service naming in ipa-server-install consistent Forces more consistency into ipa-server-install output. All descriptions of services that are not instances of SimpleServiceInstance are now in the following format: () Furthermore, start_creation method has been modified to support custom start and end messages. See documentation for more info. https://fedorahosted.org/freeipa/ticket/3059 --- ipaserver/install/dsinstance.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ipaserver/install/dsinstance.py') diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index b6033578..b48e7d76 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -160,7 +160,12 @@ info: IPA V2.0 class DsInstance(service.Service): def __init__(self, realm_name=None, domain_name=None, dm_password=None, fstore=None): - service.Service.__init__(self, "dirsrv", dm_password=dm_password, ldapi=False, autobind=service.DISABLED) + service.Service.__init__(self, "dirsrv", + service_desc="directory server", + dm_password=dm_password, + ldapi=False, + autobind=service.DISABLED + ) self.realm_name = realm_name self.sub_dict = None self.domain = domain_name @@ -256,7 +261,7 @@ class DsInstance(service.Service): self.__common_post_setup() - self.start_creation("Configuring directory server", 60) + self.start_creation(runtime=60) def create_replica(self, realm_name, master_fqdn, fqdn, domain_name, dm_password, pkcs12_info=None): @@ -290,7 +295,7 @@ class DsInstance(service.Service): self.__common_post_setup() - self.start_creation("Configuring directory server", 60) + self.start_creation(runtime=60) def __setup_replica(self): -- cgit