summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/adtrustinstance.py
diff options
context:
space:
mode:
authorTomas Babej <tbabej@redhat.com>2012-10-11 03:32:17 -0400
committerRob Crittenden <rcritten@redhat.com>2012-10-22 21:37:11 -0400
commit7ce6c4a2d3920f502b9f02e841a651bd0819915b (patch)
tree6b7857dab880cd5684f3952ef899013f0c00151f /ipaserver/install/adtrustinstance.py
parent7e3c5e3283ff9fa873691c2c2fccbfd304c1b7c7 (diff)
downloadfreeipa.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/adtrustinstance.py')
-rw-r--r--ipaserver/install/adtrustinstance.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index b3602ddc..c27fac99 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -132,7 +132,7 @@ class ADTRUSTInstance(service.Service):
self.rid_base = None
self.secondary_rid_base = None
- service.Service.__init__(self, "smb", dm_password=None, ldapi=True)
+ service.Service.__init__(self, "smb", service_desc="CIFS", dm_password=None, ldapi=True)
if fstore:
self.fstore = fstore
@@ -757,7 +757,7 @@ class ADTRUSTInstance(service.Service):
self.step("adding SIDs to existing users and groups",
self.__add_sids)
- self.start_creation("Configuring CIFS:")
+ self.start_creation(show_service_name=False)
def uninstall(self):
if self.is_configured():