diff options
| author | Tomas Babej <tbabej@redhat.com> | 2012-10-11 03:32:17 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-10-22 21:37:11 -0400 |
| commit | 7ce6c4a2d3920f502b9f02e841a651bd0819915b (patch) | |
| tree | 6b7857dab880cd5684f3952ef899013f0c00151f /ipaserver/install/dsinstance.py | |
| parent | 7e3c5e3283ff9fa873691c2c2fccbfd304c1b7c7 (diff) | |
| download | freeipa.git-7ce6c4a2d3920f502b9f02e841a651bd0819915b.tar.gz freeipa.git-7ce6c4a2d3920f502b9f02e841a651bd0819915b.tar.xz freeipa.git-7ce6c4a2d3920f502b9f02e841a651bd0819915b.zip | |
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:
<Description> (<Service Name>)
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
Diffstat (limited to 'ipaserver/install/dsinstance.py')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 11 |
1 files changed, 8 insertions, 3 deletions
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): |