diff options
21 files changed, 29 insertions, 33 deletions
diff --git a/client/ipa-client-automount b/client/ipa-client-automount index 53c05378a..c1790194e 100755 --- a/client/ipa-client-automount +++ b/client/ipa-client-automount @@ -41,7 +41,7 @@ from six.moves.urllib.parse import urlsplit from optparse import OptionParser # pylint: disable=deprecated-module from ipalib import api, errors -from ipapython import sysrestore +from ipalib.install import sysrestore from ipapython import ipautil from ipaclient import ipadiscovery from ipaclient import ipachangeconf diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index dc4ff3a7f..918b23850 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -31,6 +31,7 @@ import six from optparse import SUPPRESS_HELP # pylint: disable=deprecated-module +from ipalib.install import sysrestore from ipaserver.install import adtrustinstance from ipaserver.install.installutils import ( read_password, @@ -38,7 +39,7 @@ from ipaserver.install.installutils import ( run_script) from ipaserver.install import service from ipapython import version -from ipapython import ipautil, sysrestore, ipaldap +from ipapython import ipautil, ipaldap from ipalib import api, errors, krb_utils from ipapython.config import IPAOptionParser from ipaplatform.paths import paths 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 diff --git a/ipapython/certmonger.py b/ipalib/install/certmonger.py index 6f0948af6..6f0948af6 100644 --- a/ipapython/certmonger.py +++ b/ipalib/install/certmonger.py diff --git a/ipapython/sysrestore.py b/ipalib/install/sysrestore.py index b1bf4b912..b1bf4b912 100644 --- a/ipapython/sysrestore.py +++ b/ipalib/install/sysrestore.py diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 20fc2b730..e70253b01 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -43,14 +43,13 @@ from ipalib import api from ipalib import x509 from ipalib import errors import ipalib.constants - +from ipalib.install import certmonger from ipaplatform import services from ipaplatform.constants import constants from ipaplatform.paths import paths from ipaplatform.tasks import tasks from ipapython import dogtag -from ipapython import certmonger from ipapython import ipautil from ipapython import ipaldap from ipapython.certdb import get_ca_nickname diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py index 75a041214..ab2379b1e 100644 --- a/ipaserver/install/certs.py +++ b/ipaserver/install/certs.py @@ -33,11 +33,10 @@ import datetime import six from six.moves import configparser +from ipalib.install import certmonger, sysrestore from ipapython.ipa_log_manager import root_logger from ipapython import dogtag -from ipapython import sysrestore from ipapython import ipautil -from ipapython import certmonger from ipapython.certdb import get_ca_nickname, find_cert_from_txt, NSSDatabase from ipapython.dn import DN from ipalib import pkcs10, x509, api diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index 842973f2d..ceabda980 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -22,13 +22,12 @@ from subprocess import CalledProcessError from ipalib import api from ipalib import errors from ipalib import util -from ipalib.install import hostname +from ipalib.install import hostname, sysrestore from ipalib.install.service import enroll_only, prepare_only from ipaplatform.paths import paths from ipaplatform.constants import constants from ipaplatform import services from ipapython import ipautil -from ipapython import sysrestore from ipapython import dnsutil from ipapython.dn import DN from ipapython.dnsutil import check_zone_overlap diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py index fb18ee18e..0275f4e93 100644 --- a/ipaserver/install/dogtaginstance.py +++ b/ipaserver/install/dogtaginstance.py @@ -32,10 +32,10 @@ import pki.system from ipalib import api, errors +from ipalib.install import certmonger from ipaplatform import services from ipaplatform.constants import constants from ipaplatform.paths import paths -from ipapython import certmonger from ipapython import ipaldap from ipapython import ipautil from ipapython.dn import DN diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 24f7bfd00..f0772e22e 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -31,6 +31,7 @@ import fnmatch import ldap +from ipalib.install import certmonger from ipapython.ipa_log_manager import root_logger from ipapython import ipautil, ipaldap from ipapython import dogtag @@ -48,7 +49,6 @@ from ipalib import constants from ipaplatform.constants import constants as platformconstants from ipaplatform.tasks import tasks from ipalib.constants import CACERT -from ipapython import certmonger from ipapython.dn import DN from ipapython.admintool import ScriptError from ipaplatform import services diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 0fdffca7b..b027e5c82 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -31,10 +31,10 @@ import locale import six +from ipalib.install import certmonger from ipaserver.install import service from ipaserver.install import certs from ipaserver.install import installutils -from ipapython import certmonger from ipapython import dogtag from ipapython import ipautil from ipapython.dn import DN diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 214d42c56..1c8ea94cd 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -44,9 +44,9 @@ import six from six.moves.configparser import SafeConfigParser, NoOptionError # pylint: enable=import-error +from ipalib.install import sysrestore import ipaplatform - -from ipapython import ipautil, sysrestore, admintool, version +from ipapython import ipautil, admintool, version from ipapython.admintool import ScriptError from ipapython.ipa_log_manager import root_logger from ipalib.util import validate_hostname diff --git a/ipaserver/install/ipa_cacert_manage.py b/ipaserver/install/ipa_cacert_manage.py index 9a09b2a27..9857ea7c8 100644 --- a/ipaserver/install/ipa_cacert_manage.py +++ b/ipaserver/install/ipa_cacert_manage.py @@ -24,7 +24,8 @@ from optparse import OptionGroup # pylint: disable=deprecated-module from cryptography.hazmat.primitives import serialization import gssapi -from ipapython import admintool, certmonger, ipautil +from ipalib.install import certmonger +from ipapython import admintool, ipautil from ipapython.dn import DN from ipaplatform.paths import paths from ipalib import api, errors, x509, certstore diff --git a/ipaserver/install/opendnssecinstance.py b/ipaserver/install/opendnssecinstance.py index 9d0664d99..5bade7594 100644 --- a/ipaserver/install/opendnssecinstance.py +++ b/ipaserver/install/opendnssecinstance.py @@ -9,11 +9,12 @@ import stat import shutil from subprocess import CalledProcessError +from ipalib.install import sysrestore from ipaserver.install import service from ipaserver.install import installutils from ipapython.ipa_log_manager import root_logger from ipapython.dn import DN -from ipapython import sysrestore, ipautil +from ipapython import ipautil from ipaplatform import services from ipaplatform.constants import constants from ipaplatform.paths import paths diff --git a/ipaserver/install/plugins/ca_renewal_master.py b/ipaserver/install/plugins/ca_renewal_master.py index a92caf9c4..3ddff596e 100644 --- a/ipaserver/install/plugins/ca_renewal_master.py +++ b/ipaserver/install/plugins/ca_renewal_master.py @@ -20,8 +20,8 @@ from ipaserver.install import installutils, certs, cainstance from ipalib import errors from ipalib import Updater +from ipalib.install import certmonger from ipalib.plugable import Registry -from ipapython import certmonger from ipaplatform.paths import paths from ipapython.dn import DN diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index b8a46f5c1..644578dc7 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -14,7 +14,8 @@ import textwrap import six -from ipapython import certmonger, ipautil, sysrestore +from ipalib.install import certmonger, sysrestore +from ipapython import ipautil from ipapython.dn import DN from ipapython.ipa_log_manager import root_logger from ipapython.ipautil import ( diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index f3aa482dd..3b57c7f5c 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -17,7 +17,8 @@ import traceback from pkg_resources import parse_version import six -from ipapython import ipaldap, ipautil, sysrestore +from ipalib.install import sysrestore +from ipapython import ipaldap, ipautil from ipapython.dn import DN from ipapython.ipa_log_manager import root_logger from ipapython.admintool import ScriptError diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index ea38f7067..6277cd8b0 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -19,14 +19,14 @@ from six.moves.configparser import SafeConfigParser # pylint: enable=import-error from ipalib import api +from ipalib.install import certmonger, sysrestore import SSSDConfig import ipalib.util import ipalib.errors from ipaplatform import services from ipaplatform.tasks import tasks -from ipapython import ipautil, sysrestore, version, certdb +from ipapython import ipautil, version, certdb from ipapython.ipa_log_manager import root_logger -from ipapython import certmonger from ipapython import dnsutil from ipapython.dn import DN from ipaplatform.constants import constants diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 89d6b907a..74a9fce11 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -27,7 +27,8 @@ import tempfile import six -from ipapython import ipautil, sysrestore +from ipalib.install import sysrestore +from ipapython import ipautil from ipapython.dn import DN from ipapython.ipa_log_manager import root_logger from ipapython import kerberos diff --git a/ipaserver/install/sysupgrade.py b/ipaserver/install/sysupgrade.py index e9192ac2f..7b51eac44 100644 --- a/ipaserver/install/sysupgrade.py +++ b/ipaserver/install/sysupgrade.py @@ -20,7 +20,7 @@ import os import os.path -from ipapython import sysrestore +from ipalib.install import sysrestore from ipaplatform.paths import paths from ipapython.ipa_log_manager import root_logger |