ipapython: move certmonger and sysrestore to ipalib.install

The certmonger and sysrestore modules depend on ipaplatform.

Move them to ipalib.install as they are used only from installers.

https://fedorahosted.org/freeipa/ticket/6474

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>

2 files changed, 4 insertions, 11 deletions

diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py
index 410201606..fa84ff8bc 100644
--- a/ipaclient/install/client.py
+++ b/ipaclient/install/client.py
@@ -43,8 +43,8 @@ from ipalib import (
     x509,
 )
 from ipalib.constants import CACERT
+from ipalib.install import certmonger, service, sysrestore
 from ipalib.install import hostname as hostname_
-from ipalib.install import service
 from ipalib.install.service import enroll_only, prepare_only
 from ipalib.rpc import delete_persistent_client_session_data
 from ipalib.util import (
@@ -56,14 +56,7 @@ from ipalib.util import (
 from ipaplatform import services
 from ipaplatform.paths import paths
 from ipaplatform.tasks import tasks
-from ipapython import (
-    certdb,
-    certmonger,
-    kernel_keyring,
-    ipaldap,
-    ipautil,
-    sysrestore,
-)
+from ipapython import certdb, kernel_keyring, ipaldap, ipautil
 from ipapython.admintool import ScriptError
 from ipapython.dn import DN
 from ipapython.install import typing
diff --git a/ipaclient/ipa_certupdate.py b/ipaclient/ipa_certupdate.py
index 6e41de929..02cffe594 100644
--- a/ipaclient/ipa_certupdate.py
+++ b/ipaclient/ipa_certupdate.py
@@ -25,8 +25,8 @@ import shutil
 from six.moves.urllib.parse import urlsplit
 # pylint: enable=import-error
 
-from ipapython import (admintool, ipautil, ipaldap, sysrestore, certmonger,
-                       certdb)
+from ipalib.install import certmonger, sysrestore
+from ipapython import admintool, certdb, ipaldap, ipautil
 from ipaplatform import services
 from ipaplatform.paths import paths
 from ipaplatform.tasks import tasks