From 2d566825a32c5e4ea63f168d76690eccbdf32bca Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 17 Jul 2019 19:01:26 +0200
Subject: [PATCH] ipa[server,replica,client]: No not use wildcard imports for
modules
All module and module_utils scripts have been adapted to be able to only
import the symbols that are really needed and used.
---
roles/ipaclient/library/ipaclient_api.py | 10 +++++----
roles/ipaclient/library/ipaclient_fix_ca.py | 7 ++++--
roles/ipaclient/library/ipaclient_fstore.py | 4 +++-
roles/ipaclient/library/ipaclient_ipa_conf.py | 7 +++---
roles/ipaclient/library/ipaclient_join.py | 6 ++++-
.../library/ipaclient_set_hostname.py | 8 +++----
.../library/ipaclient_setup_automount.py | 5 +++--
.../library/ipaclient_setup_firefox.py | 4 +++-
.../ipaclient/library/ipaclient_setup_krb5.py | 6 ++---
.../ipaclient/library/ipaclient_setup_nis.py | 6 +++--
.../ipaclient/library/ipaclient_setup_nss.py | 10 ++++++++-
.../ipaclient/library/ipaclient_setup_ntp.py | 8 ++++---
.../ipaclient/library/ipaclient_setup_ssh.py | 6 ++---
.../ipaclient/library/ipaclient_setup_sssd.py | 4 +++-
roles/ipaclient/library/ipaclient_test.py | 10 ++++++++-
.../library/ipaclient_test_keytab.py | 4 +++-
.../module_utils/ansible_ipa_client.py | 22 +++++++++++--------
.../library/ipareplica_add_to_ipaservers.py | 13 ++++++++++-
.../library/ipareplica_create_ipa_conf.py | 9 +++++++-
.../ipareplica_custodia_import_dm_password.py | 9 +++++++-
.../library/ipareplica_ds_apply_updates.py | 9 +++++++-
.../library/ipareplica_ds_enable_ssl.py | 9 +++++++-
.../library/ipareplica_enable_ipa.py | 9 +++++++-
.../library/ipareplica_install_ca_certs.py | 10 ++++++++-
.../library/ipareplica_krb_enable_ssl.py | 8 ++++++-
.../library/ipareplica_master_password.py | 6 ++---
.../ipareplica/library/ipareplica_prepare.py | 21 +++++++++++++++++-
.../ipareplica_promote_openldap_conf.py | 8 ++++++-
.../library/ipareplica_promote_sssd.py | 8 ++++++-
.../library/ipareplica_restart_kdc.py | 9 +++++++-
.../library/ipareplica_setup_adtrust.py | 8 ++++++-
.../ipareplica/library/ipareplica_setup_ca.py | 10 ++++++++-
.../library/ipareplica_setup_certmonger.py | 4 +++-
.../library/ipareplica_setup_custodia.py | 8 ++++++-
.../library/ipareplica_setup_dns.py | 9 +++++++-
.../ipareplica/library/ipareplica_setup_ds.py | 11 +++++++++-
.../library/ipareplica_setup_http.py | 10 ++++++++-
.../library/ipareplica_setup_kra.py | 10 ++++++++-
.../library/ipareplica_setup_krb.py | 10 ++++++++-
.../library/ipareplica_setup_otpd.py | 9 +++++++-
roles/ipareplica/library/ipareplica_test.py | 12 ++++++----
.../module_utils/ansible_ipa_replica.py | 4 ----
.../ipaserver/library/ipaserver_enable_ipa.py | 5 ++++-
.../ipaserver/library/ipaserver_load_cache.py | 7 +++++-
.../library/ipaserver_master_password.py | 4 +++-
roles/ipaserver/library/ipaserver_prepare.py | 11 +++++++++-
.../library/ipaserver_set_ds_password.py | 6 ++++-
.../library/ipaserver_setup_adtrust.py | 5 ++++-
roles/ipaserver/library/ipaserver_setup_ca.py | 9 +++++++-
.../library/ipaserver_setup_custodia.py | 6 ++++-
.../ipaserver/library/ipaserver_setup_dns.py | 6 ++++-
roles/ipaserver/library/ipaserver_setup_ds.py | 6 ++++-
.../ipaserver/library/ipaserver_setup_http.py | 7 +++++-
.../ipaserver/library/ipaserver_setup_kra.py | 5 ++++-
.../ipaserver/library/ipaserver_setup_krb.py | 6 ++++-
.../ipaserver/library/ipaserver_setup_ntp.py | 7 +++++-
.../ipaserver/library/ipaserver_setup_otpd.py | 5 ++++-
roles/ipaserver/library/ipaserver_test.py | 18 ++++++++++++---
.../module_utils/ansible_ipa_server.py | 13 +++++------
59 files changed, 385 insertions(+), 101 deletions(-)
diff --git a/roles/ipaclient/library/ipaclient_api.py b/roles/ipaclient/library/ipaclient_api.py
index aa80d6d4..4514ce3c 100644
--- a/roles/ipaclient/library/ipaclient_api.py
+++ b/roles/ipaclient/library/ipaclient_api.py
@@ -70,13 +70,15 @@ subject_base:
'''
import os
-import sys
-import time
-import tempfile
import inspect
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ paths, x509, NUM_VERSION, serialization, certdb, api,
+ delete_persistent_client_session_data, write_tmp_file,
+ ipa_generate_password, CalledProcessError, errors, disable_ra, DN,
+ CLIENT_INSTALL_ERROR, logger
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_fix_ca.py b/roles/ipaclient/library/ipaclient_fix_ca.py
index 6e4b2bcb..4d13cdbb 100644
--- a/roles/ipaclient/library/ipaclient_fix_ca.py
+++ b/roles/ipaclient/library/ipaclient_fix_ca.py
@@ -67,8 +67,11 @@ RETURN = '''
import os
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
-
+from ansible.module_utils.ansible_ipa_client import (
+ SECURE_PATH, paths, sysrestore, options, NUM_VERSION, get_ca_cert,
+ get_ca_certs, errors
+)
+
def main():
module = AnsibleModule(
argument_spec = dict(
diff --git a/roles/ipaclient/library/ipaclient_fstore.py b/roles/ipaclient/library/ipaclient_fstore.py
index b74cf445..f41cd5f0 100644
--- a/roles/ipaclient/library/ipaclient_fstore.py
+++ b/roles/ipaclient/library/ipaclient_fstore.py
@@ -52,7 +52,9 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ paths, sysrestore
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_ipa_conf.py b/roles/ipaclient/library/ipaclient_ipa_conf.py
index 5486eba9..b68798f8 100644
--- a/roles/ipaclient/library/ipaclient_ipa_conf.py
+++ b/roles/ipaclient/library/ipaclient_ipa_conf.py
@@ -71,11 +71,10 @@ EXAMPLES = '''
RETURN = '''
'''
-import os
-import tempfile
-
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ paths, sysrestore, configure_ipa_conf
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_join.py b/roles/ipaclient/library/ipaclient_join.py
index 838852d4..6a8e6235 100644
--- a/roles/ipaclient/library/ipaclient_join.py
+++ b/roles/ipaclient/library/ipaclient_join.py
@@ -127,7 +127,11 @@ import os
import tempfile
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ SECURE_PATH, sysrestore, paths, options, configure_krb5_conf,
+ realm_to_suffix, kinit_keytab, GSSError, kinit_password, NUM_VERSION,
+ get_ca_cert, get_ca_certs, errors, run
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_set_hostname.py b/roles/ipaclient/library/ipaclient_set_hostname.py
index 2e5f6d30..7b2c2df4 100644
--- a/roles/ipaclient/library/ipaclient_set_hostname.py
+++ b/roles/ipaclient/library/ipaclient_set_hostname.py
@@ -52,11 +52,11 @@ EXAMPLES = '''
RETURN = '''
'''
-import os
-import tempfile
-
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ sysrestore, paths, tasks
+)
+
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_setup_automount.py b/roles/ipaclient/library/ipaclient_setup_automount.py
index 8b94f5b2..ca4e2d19 100644
--- a/roles/ipaclient/library/ipaclient_setup_automount.py
+++ b/roles/ipaclient/library/ipaclient_setup_automount.py
@@ -55,10 +55,11 @@ EXAMPLES = '''
RETURN = '''
'''
-import os
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ options, configure_automount
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_setup_firefox.py b/roles/ipaclient/library/ipaclient_setup_firefox.py
index 3a9b1b11..8f1fe2fa 100644
--- a/roles/ipaclient/library/ipaclient_setup_firefox.py
+++ b/roles/ipaclient/library/ipaclient_setup_firefox.py
@@ -57,7 +57,9 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ sysrestore, paths, options, configure_firefox
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_setup_krb5.py b/roles/ipaclient/library/ipaclient_setup_krb5.py
index 8ad5590f..0422e72a 100644
--- a/roles/ipaclient/library/ipaclient_setup_krb5.py
+++ b/roles/ipaclient/library/ipaclient_setup_krb5.py
@@ -58,10 +58,10 @@ EXAMPLES = '''
RETURN = '''
'''
-import os
-
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ sysrestore, paths, configure_krb5_conf, logger
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_setup_nis.py b/roles/ipaclient/library/ipaclient_setup_nis.py
index 9ef3da50..054c4584 100644
--- a/roles/ipaclient/library/ipaclient_setup_nis.py
+++ b/roles/ipaclient/library/ipaclient_setup_nis.py
@@ -54,10 +54,12 @@ EXAMPLES = '''
RETURN = '''
'''
-import os
+import inspect
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ options, sysrestore, paths, configure_nisdomain
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_setup_nss.py b/roles/ipaclient/library/ipaclient_setup_nss.py
index 1d8de99c..0a460eaf 100644
--- a/roles/ipaclient/library/ipaclient_setup_nss.py
+++ b/roles/ipaclient/library/ipaclient_setup_nss.py
@@ -155,9 +155,17 @@ RETURN = '''
import os
import time
+import inspect
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ options, sysrestore, paths, ansible_module_get_parsed_ip_addresses,
+ api, errors, create_ipa_nssdb, ipautil, ScriptError, CLIENT_INSTALL_ERROR,
+ get_certs_from_ldap, DN, certstore, x509, logger, certdb,
+ CalledProcessError, tasks, client_dns, configure_certmonger, services,
+ update_ssh_keys, save_state, configure_ldap_conf, configure_nslcd_conf,
+ nosssd_files, configure_openldap_conf, hardcode_ldap_server
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_setup_ntp.py b/roles/ipaclient/library/ipaclient_setup_ntp.py
index 645b8f1c..5400825c 100644
--- a/roles/ipaclient/library/ipaclient_setup_ntp.py
+++ b/roles/ipaclient/library/ipaclient_setup_ntp.py
@@ -83,11 +83,13 @@ EXAMPLES = '''
RETURN = '''
'''
-import os
-import socket
+import inspect
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ options, sysrestore, paths, sync_time, logger, ipadiscovery,
+ timeconf
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_setup_ssh.py b/roles/ipaclient/library/ipaclient_setup_ssh.py
index 9aefac9d..6c3cf4fd 100644
--- a/roles/ipaclient/library/ipaclient_setup_ssh.py
+++ b/roles/ipaclient/library/ipaclient_setup_ssh.py
@@ -75,10 +75,10 @@ EXAMPLES = '''
RETURN = '''
'''
-import os
-
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ options, sysrestore, paths, configure_ssh_config, configure_sshd_config
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_setup_sssd.py b/roles/ipaclient/library/ipaclient_setup_sssd.py
index f53643d6..4d9d2416 100644
--- a/roles/ipaclient/library/ipaclient_setup_sssd.py
+++ b/roles/ipaclient/library/ipaclient_setup_sssd.py
@@ -116,7 +116,9 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ options, sysrestore, paths, configure_sssd_conf, logger
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py
index 445b7518..cce9fe63 100644
--- a/roles/ipaclient/library/ipaclient_test.py
+++ b/roles/ipaclient/library/ipaclient_test.py
@@ -202,10 +202,18 @@ ipa_python_version:
import os
import socket
+import inspect
from six.moves.configparser import RawConfigParser
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ paths, sysrestore, options, CheckedIPAddress, validate_domain_name,
+ logger, x509, normalize_hostname, installer, version, ScriptError,
+ CLIENT_INSTALL_ERROR, tasks, check_ldap_conf, timeconf, constants,
+ validate_hostname, nssldap_exists, gssapi, remove_file,
+ check_ip_addresses, ipadiscovery, print_port_conf_info,
+ IPA_PYTHON_VERSION
+)
def get_cert_path(cert_path):
"""
diff --git a/roles/ipaclient/library/ipaclient_test_keytab.py b/roles/ipaclient/library/ipaclient_test_keytab.py
index 6d557014..5d63f5c7 100644
--- a/roles/ipaclient/library/ipaclient_test_keytab.py
+++ b/roles/ipaclient/library/ipaclient_test_keytab.py
@@ -104,7 +104,9 @@ import os
import tempfile
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_client import *
+from ansible.module_utils.ansible_ipa_client import (
+ SECURE_PATH, paths, kinit_keytab, run, GSSError, configure_krb5_conf
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py
index bf7a6184..d5f2b821 100644
--- a/roles/ipaclient/module_utils/ansible_ipa_client.py
+++ b/roles/ipaclient/module_utils/ansible_ipa_client.py
@@ -74,8 +74,6 @@ if NUM_VERSION >= 40400:
import gssapi
import logging
- import six
-
from ipapython import version
try:
from ipaclient.install import ipadiscovery
@@ -104,8 +102,10 @@ if NUM_VERSION >= 40400:
from ipaplatform import services
from ipaplatform.paths import paths
from ipaplatform.tasks import tasks
- if NUM_VERSION >= 40500 and NUM_VERSION < 40590:
+ try:
from cryptography.hazmat.primitives import serialization
+ except ImportError:
+ serialization = None
from ipapython.ipautil import CalledProcessError, write_tmp_file, \
ipa_generate_password
from ipapython.dn import DN
@@ -126,7 +126,9 @@ if NUM_VERSION >= 40400:
CLIENT_INSTALL_ERROR, is_ipa_client_installed, \
CLIENT_ALREADY_CONFIGURED, nssldap_exists, remove_file, \
check_ip_addresses, print_port_conf_info, configure_ipa_conf, \
- purge_host_keytab, configure_sssd_conf
+ purge_host_keytab, configure_sssd_conf, configure_ldap_conf, \
+ configure_nslcd_conf, nosssd_files
+ get_ca_cert = None
except ImportError:
# Create temporary copy of ipa-client-install script (as
# ipa_client_install.py) to be able to import the script easily
@@ -135,7 +137,8 @@ if NUM_VERSION >= 40400:
# needed in the next step.
# This is done in a temporary directory that gets removed right
# after ipa_client_install has been imported.
- import shutil, tempfile
+ import shutil
+ import tempfile
temp_dir = tempfile.mkdtemp(dir="/tmp")
sys.path.append(temp_dir)
temp_file = "%s/ipa_client_install.py" % temp_dir
@@ -169,6 +172,7 @@ if NUM_VERSION >= 40400:
get_ca_cert = ipa_client_install.get_ca_cert
get_ca_certs = None
else:
+ get_ca_cert = None
get_ca_certs = ipa_client_install.get_ca_certs
SECURE_PATH = ("/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin")
@@ -192,6 +196,10 @@ if NUM_VERSION >= 40400:
def configure_nisdomain(options, domain, statestore=None):
return ipa_client_install.configure_nisdomain(options, domain)
+ configure_ldap_conf = ipa_client_install.configure_ldap_conf
+ configure_nslcd_conf = ipa_client_install.configure_nslcd_conf
+ nosssd_files = ipa_client_install.nosssd_files
+
configure_ssh_config = ipa_client_install.configure_ssh_config
configure_sshd_config = ipa_client_install.configure_sshd_config
configure_automount = ipa_client_install.configure_automount
@@ -199,9 +207,6 @@ if NUM_VERSION >= 40400:
from ipapython.ipautil import realm_to_suffix, run
- if six.PY3:
- unicode = str
-
try:
from ipaclient.install import timeconf
time_service = "chronyd"
@@ -253,4 +258,3 @@ def ansible_module_get_parsed_ip_addresses(ansible_module,
ansible_module.fail_json(msg="Invalid IP Address %s: %s" % (ip, e))
ip_addrs.append(ip_parsed)
return ip_addrs
-
diff --git a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
index 6c5a0963..edc19504 100644
--- a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
+++ b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
@@ -62,8 +62,19 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+import six
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_remote_api, api
+)
+
+if six.PY3:
+ unicode = str
+
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_create_ipa_conf.py b/roles/ipareplica/library/ipareplica_create_ipa_conf.py
index 9f13432a..076acc77 100644
--- a/roles/ipareplica/library/ipareplica_create_ipa_conf.py
+++ b/roles/ipareplica/library/ipareplica_create_ipa_conf.py
@@ -131,8 +131,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ ansible_module_get_parsed_ip_addresses, sysrestore,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, create_ipa_conf
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
index d32ca36f..4701ec65 100644
--- a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
+++ b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
@@ -86,8 +86,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+import inspect
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, redirect_stdout, custodiainstance
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_ds_apply_updates.py b/roles/ipareplica/library/ipareplica_ds_apply_updates.py
index f0ab776f..1651335b 100644
--- a/roles/ipareplica/library/ipareplica_ds_apply_updates.py
+++ b/roles/ipareplica/library/ipareplica_ds_apply_updates.py
@@ -47,8 +47,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout,
+ replica_ds_init_info, dsinstance, upgradeinstance, installutils
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
index 49237430..1a265085 100644
--- a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
+++ b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
@@ -86,8 +86,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout,
+ replica_ds_init_info
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_enable_ipa.py b/roles/ipareplica/library/ipareplica_enable_ipa.py
index 908da223..82ae2e6e 100644
--- a/roles/ipareplica/library/ipareplica_enable_ipa.py
+++ b/roles/ipareplica/library/ipareplica_enable_ipa.py
@@ -65,8 +65,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, service,
+ find_providing_servers, services
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_install_ca_certs.py b/roles/ipareplica/library/ipareplica_install_ca_certs.py
index 71f296e0..89128608 100644
--- a/roles/ipareplica/library/ipareplica_install_ca_certs.py
+++ b/roles/ipareplica/library/ipareplica_install_ca_certs.py
@@ -98,8 +98,16 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ ansible_module_get_parsed_ip_addresses,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, ipaldap,
+ install_ca_cert
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
index 58d83012..6df27457 100644
--- a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
+++ b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
@@ -47,8 +47,14 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths, sysrestore,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, krbinstance, redirect_stdout
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_master_password.py b/roles/ipareplica/library/ipareplica_master_password.py
index 19ebc3a7..7f3a2d5f 100644
--- a/roles/ipareplica/library/ipareplica_master_password.py
+++ b/roles/ipareplica/library/ipareplica_master_password.py
@@ -51,10 +51,10 @@ password:
returned: always
'''
-import os
-
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ ipa_generate_password
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_prepare.py b/roles/ipareplica/library/ipareplica_prepare.py
index a9b1bcd1..22439fb1 100644
--- a/roles/ipareplica/library/ipareplica_prepare.py
+++ b/roles/ipareplica/library/ipareplica_prepare.py
@@ -133,8 +133,27 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+import tempfile
+import traceback
+import six
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, options, installer, DN, paths, sysrestore,
+ ansible_module_get_parsed_ip_addresses, Env, ipautil, ipaldap,
+ installutils, ReplicaConfig, load_pkcs12, kinit_keytab, create_api,
+ rpc_client, check_remote_version, parse_version, check_remote_fips_mode,
+ ReplicationManager, promotion_check_ipa_domain, current_domain_level,
+ check_domain_level_is_supported, errors, ScriptError,
+ logger, check_dns_resolution, service, find_providing_server, ca, kra,
+ dns, no_matching_interface_for_ip_address_warning, adtrust,
+ constants, api, redirect_stdout, replica_conn_check, tasks
+)
+
+if six.PY3:
+ unicode = str
+
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_promote_openldap_conf.py b/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
index 6327badd..50adabc2 100644
--- a/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
+++ b/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
@@ -65,8 +65,14 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths, # sysrestore,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, redirect_stdout, promote_openldap_conf
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_promote_sssd.py b/roles/ipareplica/library/ipareplica_promote_sssd.py
index 8fc71bf9..f3fe67e5 100644
--- a/roles/ipareplica/library/ipareplica_promote_sssd.py
+++ b/roles/ipareplica/library/ipareplica_promote_sssd.py
@@ -65,8 +65,14 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, redirect_stdout, promote_sssd
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_restart_kdc.py b/roles/ipareplica/library/ipareplica_restart_kdc.py
index e766ff85..56934184 100644
--- a/roles/ipareplica/library/ipareplica_restart_kdc.py
+++ b/roles/ipareplica/library/ipareplica_restart_kdc.py
@@ -47,8 +47,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths, sysrestore,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, service,
+ krbinstance
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_adtrust.py b/roles/ipareplica/library/ipareplica_setup_adtrust.py
index 93b7ac78..ec4fd58d 100644
--- a/roles/ipareplica/library/ipareplica_setup_adtrust.py
+++ b/roles/ipareplica/library/ipareplica_setup_adtrust.py
@@ -65,8 +65,14 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths, sysrestore,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, adtrust
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_ca.py b/roles/ipareplica/library/ipareplica_setup_ca.py
index 3291facc..b7da5aa2 100644
--- a/roles/ipareplica/library/ipareplica_setup_ca.py
+++ b/roles/ipareplica/library/ipareplica_setup_ca.py
@@ -104,8 +104,16 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ ansible_module_get_parsed_ip_addresses,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, ca,
+ custodiainstance
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_certmonger.py b/roles/ipareplica/library/ipareplica_setup_certmonger.py
index 264498b9..412c5bc8 100644
--- a/roles/ipareplica/library/ipareplica_setup_certmonger.py
+++ b/roles/ipareplica/library/ipareplica_setup_certmonger.py
@@ -48,7 +48,9 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, redirect_stdout, configure_certmonger
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_custodia.py b/roles/ipareplica/library/ipareplica_setup_custodia.py
index f0ecb2b0..cde1580e 100644
--- a/roles/ipareplica/library/ipareplica_setup_custodia.py
+++ b/roles/ipareplica/library/ipareplica_setup_custodia.py
@@ -86,8 +86,14 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, custodiainstance
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_dns.py b/roles/ipareplica/library/ipareplica_setup_dns.py
index 980c4c89..25f6bd62 100644
--- a/roles/ipareplica/library/ipareplica_setup_dns.py
+++ b/roles/ipareplica/library/ipareplica_setup_dns.py
@@ -68,8 +68,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, dns,
+ ansible_module_get_parsed_ip_addresses
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_ds.py b/roles/ipareplica/library/ipareplica_setup_ds.py
index 55175056..4bfb4cc3 100644
--- a/roles/ipareplica/library/ipareplica_setup_ds.py
+++ b/roles/ipareplica/library/ipareplica_setup_ds.py
@@ -134,8 +134,17 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+import inspect
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths, sysrestore,
+ ansible_module_get_parsed_ip_addresses,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, redirect_stdout, ipaldap,
+ install_replica_ds, install_dns_records, ntpinstance, ScriptError
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_http.py b/roles/ipareplica/library/ipareplica_setup_http.py
index 91167ac7..b644239e 100644
--- a/roles/ipareplica/library/ipareplica_setup_http.py
+++ b/roles/ipareplica/library/ipareplica_setup_http.py
@@ -83,8 +83,16 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+import inspect
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths, sysrestore,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, create_ipa_conf,
+ install_http
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_kra.py b/roles/ipareplica/library/ipareplica_setup_kra.py
index 4c38572d..d5dd2861 100644
--- a/roles/ipareplica/library/ipareplica_setup_kra.py
+++ b/roles/ipareplica/library/ipareplica_setup_kra.py
@@ -82,8 +82,16 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ ansible_module_get_parsed_ip_addresses,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, custodiainstance,
+ kra
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_krb.py b/roles/ipareplica/library/ipareplica_setup_krb.py
index ba27fc69..5abb0f0b 100644
--- a/roles/ipareplica/library/ipareplica_setup_krb.py
+++ b/roles/ipareplica/library/ipareplica_setup_krb.py
@@ -71,8 +71,16 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+import inspect
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths, sysrestore,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, # gen_remote_api,
+ api, redirect_stdout, install_krb
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_setup_otpd.py b/roles/ipareplica/library/ipareplica_setup_otpd.py
index 743e53fc..abf82717 100644
--- a/roles/ipareplica/library/ipareplica_setup_otpd.py
+++ b/roles/ipareplica/library/ipareplica_setup_otpd.py
@@ -77,8 +77,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, installer, DN, paths,
+ gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize,
+ gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, otpdinstance,
+ ipautil
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/library/ipareplica_test.py b/roles/ipareplica/library/ipareplica_test.py
index 973011f9..5c38c8ef 100644
--- a/roles/ipareplica/library/ipareplica_test.py
+++ b/roles/ipareplica/library/ipareplica_test.py
@@ -45,12 +45,16 @@ RETURN = '''
'''
import os
-import sys
-import logging
-import tempfile, shutil
+import inspect
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_replica import *
+from ansible.module_utils.ansible_ipa_replica import (
+ AnsibleModuleLog, options, installer, paths, sysrestore,
+ ansible_module_get_parsed_ip_addresses, service,
+ redirect_stdout, create_ipa_conf, ipautil,
+ x509, validate_domain_name, common_check,
+ IPA_PYTHON_VERSION
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipareplica/module_utils/ansible_ipa_replica.py b/roles/ipareplica/module_utils/ansible_ipa_replica.py
index d27aa9fe..07edf727 100644
--- a/roles/ipareplica/module_utils/ansible_ipa_replica.py
+++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py
@@ -55,7 +55,6 @@ if NUM_VERSION >= 40600:
import traceback
from pkg_resources import parse_version
- import six
from ipaclient.install.ipachangeconf import IPAChangeConf
from ipalib.install import certstore, sysrestore
@@ -105,9 +104,6 @@ if NUM_VERSION >= 40600:
import SSSDConfig
from subprocess import CalledProcessError
- if six.PY3:
- unicode = str
-
try:
from ipaclient.install import timeconf
time_service = "chronyd"
diff --git a/roles/ipaserver/library/ipaserver_enable_ipa.py b/roles/ipaserver/library/ipaserver_enable_ipa.py
index 38a77d8c..a0aa9620 100644
--- a/roles/ipaserver/library/ipaserver_enable_ipa.py
+++ b/roles/ipaserver/library/ipaserver_enable_ipa.py
@@ -47,7 +47,10 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, paths, api, sysrestore, tasks,
+ service, bindinstance, redirect_stdout, services
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_load_cache.py b/roles/ipaserver/library/ipaserver_load_cache.py
index 883cdf12..00b5b5ff 100644
--- a/roles/ipaserver/library/ipaserver_load_cache.py
+++ b/roles/ipaserver/library/ipaserver_load_cache.py
@@ -47,8 +47,13 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ #AnsibleModuleLog,
+ options, paths, read_cache
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_master_password.py b/roles/ipaserver/library/ipaserver_master_password.py
index 85153e98..1675b6cd 100644
--- a/roles/ipaserver/library/ipaserver_master_password.py
+++ b/roles/ipaserver/library/ipaserver_master_password.py
@@ -54,7 +54,9 @@ password:
import os
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ options, paths, read_cache, ipa_generate_password
+)
def main():
module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_prepare.py b/roles/ipaserver/library/ipaserver_prepare.py
index a598accb..649b2ca9 100644
--- a/roles/ipaserver/library/ipaserver_prepare.py
+++ b/roles/ipaserver/library/ipaserver_prepare.py
@@ -74,8 +74,17 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, sysrestore, paths,
+ ansible_module_get_parsed_ip_addresses,
+ redirect_stdout, adtrust, api, default_subject_base,
+ default_ca_subject_dn, ipautil, installutils, ca, kra, dns,
+ get_server_ip_address, no_matching_interface_for_ip_address_warning,
+ services, logger, tasks, update_hosts_file, ScriptError
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_set_ds_password.py b/roles/ipaserver/library/ipaserver_set_ds_password.py
index c9bf7c77..c18be108 100644
--- a/roles/ipaserver/library/ipaserver_set_ds_password.py
+++ b/roles/ipaserver/library/ipaserver_set_ds_password.py
@@ -47,7 +47,11 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ MAX_DOMAIN_LEVEL, AnsibleModuleLog, options, sysrestore, paths,
+ api_Backend_ldap2, ds_init_info, redirect_stdout
+)
+
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_adtrust.py b/roles/ipaserver/library/ipaserver_setup_adtrust.py
index 454a8523..7c85d875 100644
--- a/roles/ipaserver/library/ipaserver_setup_adtrust.py
+++ b/roles/ipaserver/library/ipaserver_setup_adtrust.py
@@ -47,7 +47,10 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, sysrestore, paths,
+ api_Backend_ldap2, redirect_stdout, adtrust, api
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_ca.py b/roles/ipaserver/library/ipaserver_setup_ca.py
index 14b8bae0..f13fb265 100644
--- a/roles/ipaserver/library/ipaserver_setup_ca.py
+++ b/roles/ipaserver/library/ipaserver_setup_ca.py
@@ -76,8 +76,15 @@ EXAMPLES = '''
RETURN = '''
'''
+import os
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, sysrestore, paths,
+ ansible_module_get_parsed_ip_addresses,
+ api_Backend_ldap2, redirect_stdout, ca, installutils, ds_init_info,
+ custodiainstance, write_cache, x509
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_custodia.py b/roles/ipaserver/library/ipaserver_setup_custodia.py
index b84b5394..2f6392c1 100644
--- a/roles/ipaserver/library/ipaserver_setup_custodia.py
+++ b/roles/ipaserver/library/ipaserver_setup_custodia.py
@@ -50,7 +50,11 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, # sysrestore, paths,
+ api_Backend_ldap2,
+ custodiainstance, redirect_stdout
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_dns.py b/roles/ipaserver/library/ipaserver_setup_dns.py
index 1255a00e..d079ecd6 100644
--- a/roles/ipaserver/library/ipaserver_setup_dns.py
+++ b/roles/ipaserver/library/ipaserver_setup_dns.py
@@ -54,7 +54,11 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, paths, dns,
+ ansible_module_get_parsed_ip_addresses, sysrestore, api_Backend_ldap2,
+ redirect_stdout, bindinstance
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_ds.py b/roles/ipaserver/library/ipaserver_setup_ds.py
index 6663d19f..719b12c2 100644
--- a/roles/ipaserver/library/ipaserver_setup_ds.py
+++ b/roles/ipaserver/library/ipaserver_setup_ds.py
@@ -59,7 +59,11 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, sysrestore, paths,
+ api_Backend_ldap2, redirect_stdout, api, NUM_VERSION, tasks,
+ dsinstance, ntpinstance, IPAAPI_USER
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_http.py b/roles/ipaserver/library/ipaserver_setup_http.py
index be6e3408..7de76199 100644
--- a/roles/ipaserver/library/ipaserver_setup_http.py
+++ b/roles/ipaserver/library/ipaserver_setup_http.py
@@ -47,7 +47,12 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, sysrestore, paths,
+ ansible_module_get_parsed_ip_addresses,
+ api_Backend_ldap2, redirect_stdout, ds_init_info,
+ krbinstance, httpinstance, ca, service, tasks
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_kra.py b/roles/ipaserver/library/ipaserver_setup_kra.py
index fd7429c4..9da8b841 100644
--- a/roles/ipaserver/library/ipaserver_setup_kra.py
+++ b/roles/ipaserver/library/ipaserver_setup_kra.py
@@ -47,7 +47,10 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options,
+ api_Backend_ldap2, redirect_stdout, api, custodiainstance, kra
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_krb.py b/roles/ipaserver/library/ipaserver_setup_krb.py
index e16f6fc8..d2f3663b 100644
--- a/roles/ipaserver/library/ipaserver_setup_krb.py
+++ b/roles/ipaserver/library/ipaserver_setup_krb.py
@@ -47,7 +47,11 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, sysrestore, paths,
+ ansible_module_get_parsed_ip_addresses,
+ api_Backend_ldap2, redirect_stdout, krbinstance
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_ntp.py b/roles/ipaserver/library/ipaserver_setup_ntp.py
index 64383b2f..a3a6954e 100644
--- a/roles/ipaserver/library/ipaserver_setup_ntp.py
+++ b/roles/ipaserver/library/ipaserver_setup_ntp.py
@@ -46,8 +46,13 @@ EXAMPLES = '''
RETURN = '''
'''
+import inspect
+
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, sysrestore, paths,
+ redirect_stdout, time_service, sync_time, ntpinstance, timeconf
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_setup_otpd.py b/roles/ipaserver/library/ipaserver_setup_otpd.py
index 3db6cfb7..d5aa6075 100644
--- a/roles/ipaserver/library/ipaserver_setup_otpd.py
+++ b/roles/ipaserver/library/ipaserver_setup_otpd.py
@@ -47,7 +47,10 @@ RETURN = '''
'''
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, # sysrestore, paths,
+ api_Backend_ldap2, redirect_stdout, otpdinstance, ipautil
+)
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 88b5db74..4a6700de 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/roles/ipaserver/library/ipaserver_test.py
@@ -46,11 +46,23 @@ RETURN = '''
import os
import sys
-import logging
-import tempfile, shutil
+import six
+import inspect
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.ansible_ipa_server import *
+from ansible.module_utils.ansible_ipa_server import (
+ AnsibleModuleLog, options, adtrust_imported, kra_imported, PKIIniLoader,
+ random, MIN_DOMAIN_LEVEL, MAX_DOMAIN_LEVEL, check_zone_overlap,
+ redirect_stdout, validate_dm_password, validate_admin_password,
+ NUM_VERSION, is_ipa_configured, sysrestore, paths, bindinstance,
+ read_cache, ca, tasks, check_ldap_conf, timeconf, httpinstance,
+ check_dirsrv, ScriptError, get_fqdn, verify_fqdn, BadHostError,
+ validate_domain_name, load_pkcs12, IPA_PYTHON_VERSION
+)
+
+if six.PY3:
+ unicode = str
+
def main():
ansible_module = AnsibleModule(
diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py
index e19eb2ec..2eba3ca0 100644
--- a/roles/ipaserver/module_utils/ansible_ipa_server.py
+++ b/roles/ipaserver/module_utils/ansible_ipa_server.py
@@ -50,8 +50,6 @@ if NUM_VERSION >= 40500:
import textwrap
import random
- import six
-
if NUM_VERSION >= 40690:
from ipaclient.install.ipachangeconf import IPAChangeConf
from ipalib.install import certmonger, sysrestore
@@ -66,9 +64,12 @@ if NUM_VERSION >= 40500:
from ipaplatform.paths import paths
from ipaplatform.tasks import tasks
from ipalib import api, errors, x509
- from ipalib.constants import DOMAIN_LEVEL_0, MIN_DOMAIN_LEVEL, MAX_DOMAIN_LEVEL
- if NUM_VERSION == 40504:
+ from ipalib.constants import DOMAIN_LEVEL_0, MIN_DOMAIN_LEVEL, \
+ MAX_DOMAIN_LEVEL
+ try:
from ipalib.constants import IPAAPI_USER
+ except ImportError:
+ IPAAPI_USER = None
from ipalib.util import (
validate_domain_name,
no_matching_interface_for_ip_address_warning,
@@ -87,6 +88,7 @@ if NUM_VERSION >= 40500:
from ipaclient import ntpconf as timeconf
from ipaserver.install import ntpinstance
time_service = "ntpd"
+ sync_time = None
from ipaserver.install import (
adtrust, bindinstance, ca, dns, dsinstance,
httpinstance, installutils, kra, krbinstance,
@@ -116,9 +118,6 @@ if NUM_VERSION >= 40500:
def default_ca_subject_dn(subject_base):
return DN(('CN', 'Certificate Authority'), subject_base)
- if six.PY3:
- unicode = str
-
try:
from ipaserver.install import adtrustinstance
_server_trust_ad_installed = True
--
GitLab