diff options
author | Tomas Babej <tbabej@redhat.com> | 2014-05-29 10:37:18 +0200 |
---|---|---|
committer | Petr Viktorin <pviktori@redhat.com> | 2014-06-16 19:48:19 +0200 |
commit | 49fcd42f8fd71b894a0953a37f10a6c326e16048 (patch) | |
tree | 0c1324c5a3183ce20e92af183ffefde92a77147a /ipaserver/install/installutils.py | |
parent | 926f8647d2a676c1dd2e446633eb76cdf1a7bf0c (diff) | |
download | freeipa-49fcd42f8fd71b894a0953a37f10a6c326e16048.tar.gz freeipa-49fcd42f8fd71b894a0953a37f10a6c326e16048.tar.xz freeipa-49fcd42f8fd71b894a0953a37f10a6c326e16048.zip |
ipaplatform: Change service code in freeipa to use ipaplatform services
https://fedorahosted.org/freeipa/ticket/4052
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'ipaserver/install/installutils.py')
-rw-r--r-- | ipaserver/install/installutils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 7f15d3769..a2de7c1bd 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -43,6 +43,7 @@ from ipalib import errors from ipapython.dn import DN from ipaserver.install import certs, service from ipapython import services as ipaservices +from ipaplatform import services # Used to determine install status IPA_MODULES = [ @@ -833,19 +834,19 @@ def stopped_service(service, instance_name=""): log_instance_name) # Figure out if the service is running, if not, yield - if not ipaservices.knownservices[service].is_running(instance_name): + if not services.knownservices[service].is_running(instance_name): root_logger.debug('Service %s%s is not running, continue.', service, log_instance_name) yield else: # Stop the service, do the required stuff and start it again root_logger.debug('Stopping %s%s.', service, log_instance_name) - ipaservices.knownservices[service].stop(instance_name) + services.knownservices[service].stop(instance_name) try: yield finally: root_logger.debug('Starting %s%s.', service, log_instance_name) - ipaservices.knownservices[service].start(instance_name) + services.knownservices[service].start(instance_name) def check_entropy(): ''' |