diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2011-10-10 15:25:15 +0300 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2011-10-24 15:10:11 +0200 |
| commit | 25d5d7ed939384340c0aa7d00989cbddf4226bcd (patch) | |
| tree | 3f738da9e1603b5577e1fb2a644b8a3c9a189162 /ipaserver/install/cainstance.py | |
| parent | f098b213eb3d2e8e5d47689a226f81a0d1b35262 (diff) | |
| download | freeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.tar.gz freeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.tar.xz freeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.zip | |
Add support for systemd environments and use it to support Fedora 16
https://fedorahosted.org/freeipa/ticket/1192
Diffstat (limited to 'ipaserver/install/cainstance.py')
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index c819957a6..fed4b2cdf 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -375,7 +375,7 @@ class CADSInstance(service.Service): def restart_instance(self): try: ipaservices.knownservices.dirsrv.restart(self.serverid) - if not dsinstance.is_ds_running(): + if not dsinstance.is_ds_running(self.serverid): logging.critical("Failed to restart the directory server. See the installation log for details.") sys.exit(1) except Exception: @@ -693,7 +693,7 @@ class CAInstance(service.Service): def __restart_instance(self): try: - self.restart() + self.restart(PKI_INSTANCE_NAME) installutils.wait_for_open_ports('localhost', 9180, 300) except Exception: # TODO: roll back here? |