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 /ipaclient | |
| 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 'ipaclient')
| -rw-r--r-- | ipaclient/install/client.py | 8 | ||||
| -rw-r--r-- | ipaclient/install/ipa_certupdate.py (renamed from ipaclient/ipa_certupdate.py) | 0 | ||||
| -rw-r--r-- | ipaclient/install/ipachangeconf.py (renamed from ipaclient/ipachangeconf.py) | 0 | ||||
| -rw-r--r-- | ipaclient/install/ipadiscovery.py (renamed from ipaclient/ipadiscovery.py) | 0 | ||||
| -rw-r--r-- | ipaclient/install/ntpconf.py (renamed from ipaclient/ntpconf.py) | 0 |
5 files changed, 2 insertions, 6 deletions
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 index 2c55db462..2c55db462 100644 --- a/ipaclient/ipa_certupdate.py +++ b/ipaclient/install/ipa_certupdate.py diff --git a/ipaclient/ipachangeconf.py b/ipaclient/install/ipachangeconf.py index 610cd5011..610cd5011 100644 --- a/ipaclient/ipachangeconf.py +++ b/ipaclient/install/ipachangeconf.py diff --git a/ipaclient/ipadiscovery.py b/ipaclient/install/ipadiscovery.py index 46e05c971..46e05c971 100644 --- a/ipaclient/ipadiscovery.py +++ b/ipaclient/install/ipadiscovery.py diff --git a/ipaclient/ntpconf.py b/ipaclient/install/ntpconf.py index a8d04f92a..a8d04f92a 100644 --- a/ipaclient/ntpconf.py +++ b/ipaclient/install/ntpconf.py |