From 49fcd42f8fd71b894a0953a37f10a6c326e16048 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Thu, 29 May 2014 10:37:18 +0200 Subject: ipaplatform: Change service code in freeipa to use ipaplatform services https://fedorahosted.org/freeipa/ticket/4052 Reviewed-By: Petr Viktorin --- ipaserver/install/ipa_restore.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ipaserver/install/ipa_restore.py') diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index 56e522895..d2064d4af 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -40,6 +40,7 @@ from ipapython import services as ipaservices from ipapython import ipaldap from ipaplatform import tasks from ipaserver.install.ipa_backup import BACKUP_DIR +from ipaplatform import services def recursive_chown(path, uid, gid): @@ -204,7 +205,7 @@ class Restore(admintool.AdminTool): cwd = os.getcwd() try: - dirsrv = ipaservices.knownservices.dirsrv + dirsrv = services.knownservices.dirsrv self.read_header() # These two checks would normally be in the validate method but @@ -294,13 +295,13 @@ class Restore(admintool.AdminTool): else: # explicitly enable then disable the pki tomcatd service to # re-register its instance. FIXME, this is really wierd. - ipaservices.knownservices.pki_tomcatd.enable() - ipaservices.knownservices.pki_tomcatd.disable() + services.knownservices.pki_tomcatd.enable() + services.knownservices.pki_tomcatd.disable() self.log.info('Starting IPA services') run(['ipactl', 'start']) self.log.info('Restarting SSSD') - sssd = ipaservices.service('sssd') + sssd = services.service('sssd') sssd.restart() finally: try: -- cgit