diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-23 15:42:08 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | 70c3cd7f482bee7d5ad12062daa7ad6181a29094 (patch) | |
| tree | b61727b8e04364b3c26a859d4a3e691fb32a23eb /install | |
| parent | d43b57d2ce8552ed4977dcc33667b4226fe3333b (diff) | |
| download | freeipa-70c3cd7f482bee7d5ad12062daa7ad6181a29094.tar.gz freeipa-70c3cd7f482bee7d5ad12062daa7ad6181a29094.tar.xz freeipa-70c3cd7f482bee7d5ad12062daa7ad6181a29094.zip | |
ipaclient: move install modules to the install subpackage
The ipa_certupdate, ipachangeconf, ipadiscovery and ntpconf modules depend
on ipaplatform.
Move them to ipaclient.install as they are used only from the client
installer.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-replica-conncheck | 4 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-manage | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index 7ec1ef83b..544116efb 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -20,13 +20,13 @@ from __future__ import print_function +import ipaclient.install.ipachangeconf from ipapython.config import IPAOptionParser from ipapython.dn import DN from ipapython import version from ipapython import ipautil, certdb from ipalib import api, errors, x509 from ipaserver.install import installutils -import ipaclient.ipachangeconf # pylint: disable=deprecated-module from optparse import OptionGroup, OptionValueError # pylint: enable=deprecated-module @@ -238,7 +238,7 @@ def sigterm_handler(signum, frame): def configure_krb5_conf(realm, kdc, filename): - krbconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer") + krbconf = ipaclient.install.ipachangeconf.IPAChangeConf("IPA Installer") krbconf.setOptionAssignment((" = ", " ")) krbconf.setSectionNameDelimiters(("[","]")) krbconf.setSubSectionDelimiters(("{","}")) diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 83725bc8f..1ee7301e6 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -33,6 +33,7 @@ from six.moves.urllib.parse import urlparse from six.moves.xmlrpc_client import MAXINT # pylint: enable=import-error +from ipaclient.install import ipadiscovery from ipapython import ipautil from ipaserver.install import replication, dsinstance, installutils from ipaserver.install import bindinstance, cainstance, certs @@ -43,7 +44,6 @@ from ipalib.util import has_managed_topology, verify_host_resolvable from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipapython.dn import DN from ipapython.config import IPAOptionParser -from ipaclient import ipadiscovery from ipaplatform.paths import paths # dict of command name and tuples of min/max num of args needed |