summaryrefslogtreecommitdiffstats
path: root/ipaclient/install/client.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-11-23 15:04:40 +0100
committerMartin Basti <mbasti@redhat.com>2016-11-29 14:50:51 +0100
commit26c46a447f82b4cf37a5076b72cf6328857d5f35 (patch)
treea0ee44b13530ed34f190e65f7e0726d88a71f304 /ipaclient/install/client.py
parenta1f260d021bf5d018e634438fde6b7c81ebbbcef (diff)
downloadfreeipa-26c46a447f82b4cf37a5076b72cf6328857d5f35.tar.gz
freeipa-26c46a447f82b4cf37a5076b72cf6328857d5f35.tar.xz
freeipa-26c46a447f82b4cf37a5076b72cf6328857d5f35.zip
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>
Diffstat (limited to 'ipaclient/install/client.py')
-rw-r--r--ipaclient/install/client.py11
1 files changed, 2 insertions, 9 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