diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2014-11-11 16:07:37 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2014-11-13 10:49:17 +0000 |
| commit | e60ef1fe029594876bd0e075cd5efc0173743138 (patch) | |
| tree | a20860f264359a1828184971216acbccf1cc6f2d /ipaplatform | |
| parent | a7162e7766150aa7577a42747a4d583a425f7271 (diff) | |
| download | freeipa-e60ef1fe029594876bd0e075cd5efc0173743138.tar.gz freeipa-e60ef1fe029594876bd0e075cd5efc0173743138.tar.xz freeipa-e60ef1fe029594876bd0e075cd5efc0173743138.zip | |
ipaplatform: Use the dirsrv service, not target
IPA only uses one instance of the directory server. When an instance
is not specified to a call to service.start/stop/restart/...,
use IPA's instance.
Stopping a systemd service is synchronous (bby default), but stopping
a target is not. This will change ensures that the directory server
is actually down when stop() finishes.
https://fedorahosted.org/freeipa/ticket/4709
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipaplatform')
| -rw-r--r-- | ipaplatform/base/services.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipaplatform/base/services.py b/ipaplatform/base/services.py index 01d95b39c..5921da920 100644 --- a/ipaplatform/base/services.py +++ b/ipaplatform/base/services.py @@ -187,8 +187,7 @@ class SystemdService(PlatformService): elements = self.systemd_name.split("@") # Make sure the correct DS instance is returned - if (elements[0] == 'dirsrv' and not instance_name and - operation == 'is-active'): + if elements[0] == 'dirsrv' and not instance_name: return ('dirsrv@%s.service' % str(self.api.env.realm.replace('.', '-'))) |