From 70c3cd7f482bee7d5ad12062daa7ad6181a29094 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Wed, 23 Nov 2016 15:42:08 +0100 Subject: [PATCH] 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 --- client/ipa-certupdate | 2 +- client/ipa-client-automount | 4 ++-- install/tools/ipa-replica-conncheck | 4 ++-- install/tools/ipa-replica-manage | 2 +- ipaclient/install/client.py | 8 ++------ ipaclient/{ => install}/ipa_certupdate.py | 0 ipaclient/{ => install}/ipachangeconf.py | 0 ipaclient/{ => install}/ipadiscovery.py | 0 ipaclient/{ => install}/ntpconf.py | 0 ipaserver/install/adtrustinstance.py | 5 +++-- ipaserver/install/server/install.py | 12 ++++++------ ipaserver/install/server/replicainstall.py | 12 ++++++------ 12 files changed, 23 insertions(+), 26 deletions(-) rename ipaclient/{ => install}/ipa_certupdate.py (100%) rename ipaclient/{ => install}/ipachangeconf.py (100%) rename ipaclient/{ => install}/ipadiscovery.py (100%) rename ipaclient/{ => install}/ntpconf.py (100%) diff --git a/client/ipa-certupdate b/client/ipa-certupdate index 072c451bc..d4168ed86 100755 --- a/client/ipa-certupdate +++ b/client/ipa-certupdate @@ -18,6 +18,6 @@ # along with this program. If not, see . # -from ipaclient.ipa_certupdate import CertUpdate +from ipaclient.install.ipa_certupdate import CertUpdate CertUpdate.run_cli() diff --git a/client/ipa-client-automount b/client/ipa-client-automount index e7fddaf03..0dd15b39f 100755 --- a/client/ipa-client-automount +++ b/client/ipa-client-automount @@ -40,12 +40,12 @@ from six.moves.urllib.parse import urlsplit # pylint: enable=import-error from optparse import OptionParser # pylint: disable=deprecated-module + +from ipaclient.install import ipachangeconf, ipadiscovery from ipalib import api, errors from ipalib.install import sysrestore from ipalib.install.kinit import kinit_keytab from ipapython import ipautil -from ipaclient import ipadiscovery -from ipaclient import ipachangeconf from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipapython.dn import DN from ipaplatform.constants import constants 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 diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py index b98f35f1e..7bd84045d 100644 --- a/ipaclient/install/client.py +++ b/ipaclient/install/client.py @@ -31,11 +31,6 @@ from six.moves.configparser import RawConfigParser from six.moves.urllib.parse import urlparse, urlunparse # pylint: enable=import-error -from ipaclient import ( - ipadiscovery, - ntpconf, -) -from ipaclient.ipachangeconf import IPAChangeConf from ipalib import api, errors, x509 from ipalib.install import certmonger, certstore, service, sysrestore from ipalib.install import hostname as hostname_ @@ -68,7 +63,8 @@ from ipapython.ipautil import ( ) from ipapython.ssh import SSHPublicKey -from . import automount +from . import automount, ipadiscovery, ntpconf +from .ipachangeconf import IPAChangeConf NoneType = type(None) diff --git a/ipaclient/ipa_certupdate.py b/ipaclient/install/ipa_certupdate.py similarity index 100% rename from ipaclient/ipa_certupdate.py rename to ipaclient/install/ipa_certupdate.py diff --git a/ipaclient/ipachangeconf.py b/ipaclient/install/ipachangeconf.py similarity index 100% rename from ipaclient/ipachangeconf.py rename to ipaclient/install/ipachangeconf.py diff --git a/ipaclient/ipadiscovery.py b/ipaclient/install/ipadiscovery.py similarity index 100% rename from ipaclient/ipadiscovery.py rename to ipaclient/install/ipadiscovery.py diff --git a/ipaclient/ntpconf.py b/ipaclient/install/ntpconf.py similarity index 100% rename from ipaclient/ntpconf.py rename to ipaclient/install/ntpconf.py diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index dda87d8aa..c866cdd88 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -42,7 +42,7 @@ from ipapython import ipautil from ipapython.ipa_log_manager import root_logger import ipapython.errors -import ipaclient.ipachangeconf +import ipaclient.install.ipachangeconf from ipaplatform import services from ipaplatform.paths import paths from ipaplatform.tasks import tasks @@ -614,7 +614,8 @@ class ADTRUSTInstance(service.Service): if not self.fqdn or not self.realm: self.print_msg("Cannot modify /etc/krb5.conf") - krbconf = ipaclient.ipachangeconf.IPAChangeConf("IPA Installer") + krbconf = ( + ipaclient.install.ipachangeconf.IPAChangeConf("IPA Installer")) krbconf.setOptionAssignment((" = ", " ")) krbconf.setSectionNameDelimiters(("[", "]")) krbconf.setSubSectionDelimiters(("{", "}")) diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index d015c8e52..1f2e8a437 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -30,7 +30,7 @@ from ipalib.util import ( network_ip_address_warning, broadcast_ip_address_warning, ) -import ipaclient.ntpconf +import ipaclient.install.ntpconf from ipaserver.install import ( bindinstance, ca, cainstance, certs, dns, dsinstance, httpinstance, installutils, kra, krbinstance, memcacheinstance, @@ -420,13 +420,13 @@ def install_check(installer): if not options.no_ntp: try: - ipaclient.ntpconf.check_timedate_services() - except ipaclient.ntpconf.NTPConflictingService as e: + ipaclient.install.ntpconf.check_timedate_services() + except ipaclient.install.ntpconf.NTPConflictingService as e: print(("WARNING: conflicting time&date synchronization service '%s'" " will be disabled" % e.conflicting_service)) print("in favor of ntpd") print("") - except ipaclient.ntpconf.NTPConfigurationError: + except ipaclient.install.ntpconf.NTPConfigurationError: pass # Check to see if httpd is already configured to listen on 443 @@ -726,7 +726,7 @@ def install(installer): if not options.external_cert_files: # Configure ntpd if not options.no_ntp: - ipaclient.ntpconf.force_ntpd(sstore) + ipaclient.install.ntpconf.force_ntpd(sstore) ntp = ntpinstance.NTPInstance(fstore) if not ntp.is_configured(): ntp.create_instance() @@ -1077,7 +1077,7 @@ def uninstall(installer): sstore._load() - ipaclient.ntpconf.restore_forced_ntpd(sstore) + ipaclient.install.ntpconf.restore_forced_ntpd(sstore) # Clean up group_exists (unused since IPA 2.2, not being set since 4.1) sstore.restore_state("install", "group_exists") diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 74b985784..742848da6 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -17,6 +17,8 @@ import traceback from pkg_resources import parse_version import six +from ipaclient.install.ipachangeconf import IPAChangeConf +import ipaclient.install.ntpconf from ipalib.install import certstore, sysrestore from ipalib.install.kinit import kinit_keytab from ipapython import ipaldap, ipautil @@ -33,8 +35,6 @@ from ipalib.util import ( broadcast_ip_address_warning, ) from ipaclient.install.client import configure_krb5_conf, purge_host_keytab -import ipaclient.ntpconf -from ipaclient.ipachangeconf import IPAChangeConf from ipaserver.install import ( bindinstance, ca, certs, dns, dsinstance, httpinstance, installutils, kra, krbinstance, memcacheinstance, @@ -541,12 +541,12 @@ def common_check(no_ntp): if not no_ntp: try: - ipaclient.ntpconf.check_timedate_services() - except ipaclient.ntpconf.NTPConflictingService as e: + ipaclient.install.ntpconf.check_timedate_services() + except ipaclient.install.ntpconf.NTPConflictingService as e: print("WARNING: conflicting time&date synchronization service " "'{svc}' will\nbe disabled in favor of ntpd\n" .format(svc=e.conflicting_service)) - except ipaclient.ntpconf.NTPConfigurationError: + except ipaclient.install.ntpconf.NTPConfigurationError: pass @@ -1304,7 +1304,7 @@ def install(installer): # Configure ntpd if not options.no_ntp: - ipaclient.ntpconf.force_ntpd(sstore) + ipaclient.install.ntpconf.force_ntpd(sstore) ntp = ntpinstance.NTPInstance() ntp.create_instance()