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 | 082485c2832a51cf6018bc172881e67e979de69c (patch) | |
| tree | 7637419f4e0e5427a3f706d0c5b79bc1c3dfb45b | |
| parent | 3ab75d70412921bf2362edefd6c9411cff7df92d (diff) | |
| download | freeipa-082485c2832a51cf6018bc172881e67e979de69c.tar.gz freeipa-082485c2832a51cf6018bc172881e67e979de69c.tar.xz freeipa-082485c2832a51cf6018bc172881e67e979de69c.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>
| -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 961c368e6..370b628c7 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('.', '-'))) |