diff --git a/roles/ipaclient/library/ipaclient_api.py b/roles/ipaclient/library/ipaclient_api.py index 910c744ef493c2366b11028648cc01a3b833b0e3..5ce722a907718196d611f028af2641081e1200d2 100644 --- a/roles/ipaclient/library/ipaclient_api.py +++ b/roles/ipaclient/library/ipaclient_api.py @@ -76,6 +76,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( + setup_logging, paths, x509, NUM_VERSION, serialization, certdb, api, delete_persistent_client_session_data, write_tmp_file, ipa_generate_password, CalledProcessError, errors, disable_ra, DN, @@ -95,6 +96,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + realm = module.params.get('realm') hostname = module.params.get('hostname') servers = module.params.get('servers') diff --git a/roles/ipaclient/library/ipaclient_fix_ca.py b/roles/ipaclient/library/ipaclient_fix_ca.py index 283269986fa7887eb11a6b2ad3c122e1869231c8..a3a1dae655a07ea91b1ee5c97a482677a929797a 100644 --- a/roles/ipaclient/library/ipaclient_fix_ca.py +++ b/roles/ipaclient/library/ipaclient_fix_ca.py @@ -67,6 +67,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( + setup_logging, SECURE_PATH, paths, sysrestore, options, NUM_VERSION, get_ca_cert, get_ca_certs, errors ) @@ -83,6 +84,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + servers = module.params.get('servers') realm = module.params.get('realm') basedn = module.params.get('basedn') diff --git a/roles/ipaclient/library/ipaclient_fstore.py b/roles/ipaclient/library/ipaclient_fstore.py index 33cef7bb9129b8cad068d825f925dc4a94b27f4e..db1218a208431571cb6f9572ecfb31dec1940637 100644 --- a/roles/ipaclient/library/ipaclient_fstore.py +++ b/roles/ipaclient/library/ipaclient_fstore.py @@ -53,7 +53,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( - paths, sysrestore + setup_logging, paths, sysrestore ) @@ -65,6 +65,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + backup = module.params.get('backup') fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) diff --git a/roles/ipaclient/library/ipaclient_ipa_conf.py b/roles/ipaclient/library/ipaclient_ipa_conf.py index 4865772376434df8459a243aa406567a7fce47c4..ac31e01f7aecadbfb8984353dd4d7e562df3a2db 100644 --- a/roles/ipaclient/library/ipaclient_ipa_conf.py +++ b/roles/ipaclient/library/ipaclient_ipa_conf.py @@ -70,7 +70,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( - paths, sysrestore, configure_ipa_conf + setup_logging, paths, sysrestore, configure_ipa_conf ) @@ -87,6 +87,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + servers = module.params.get('servers') domain = module.params.get('domain') realm = module.params.get('realm') diff --git a/roles/ipaclient/library/ipaclient_join.py b/roles/ipaclient/library/ipaclient_join.py index d0eca2bbe394dbf4a39293a64c1d25dfd0ce4bf3..b67be37056133e0ce4e75702f26d298c6950458f 100644 --- a/roles/ipaclient/library/ipaclient_join.py +++ b/roles/ipaclient/library/ipaclient_join.py @@ -127,6 +127,7 @@ import tempfile from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( + setup_logging, 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 @@ -155,6 +156,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + servers = module.params.get('servers') domain = module.params.get('domain') realm = module.params.get('realm') diff --git a/roles/ipaclient/library/ipaclient_set_hostname.py b/roles/ipaclient/library/ipaclient_set_hostname.py index be5576ebeeee0aeb0b07ab806a59b8505aefd076..4145df9a7b1f95fed136cd8f22517985a0c18e8d 100644 --- a/roles/ipaclient/library/ipaclient_set_hostname.py +++ b/roles/ipaclient/library/ipaclient_set_hostname.py @@ -54,7 +54,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( - sysrestore, paths, tasks + setup_logging, sysrestore, paths, tasks ) @@ -67,6 +67,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + hostname = module.params.get('hostname') fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) diff --git a/roles/ipaclient/library/ipaclient_setup_automount.py b/roles/ipaclient/library/ipaclient_setup_automount.py index e2bc340d4093ff45cbcfae4258368c8a96ad39d6..1fda9ba09d50592693a1901339b16369fd3c80a3 100644 --- a/roles/ipaclient/library/ipaclient_setup_automount.py +++ b/roles/ipaclient/library/ipaclient_setup_automount.py @@ -60,7 +60,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( - options, configure_automount + setup_logging, options, configure_automount ) @@ -77,6 +77,8 @@ def main(): # os.environ['KRB5CCNAME'] = paths.IPA_DNS_CCACHE module._ansible_debug = True + setup_logging() + options.servers = module.params.get('servers') options.server = options.servers options.sssd = module.params.get('sssd') diff --git a/roles/ipaclient/library/ipaclient_setup_firefox.py b/roles/ipaclient/library/ipaclient_setup_firefox.py index 71db33e57a0eae2234b8d8f7beb972ea8a80c87d..36116aebe4c2a06ea0430c77a8c8b813d8835019 100644 --- a/roles/ipaclient/library/ipaclient_setup_firefox.py +++ b/roles/ipaclient/library/ipaclient_setup_firefox.py @@ -60,7 +60,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( - sysrestore, paths, options, configure_firefox + setup_logging, sysrestore, paths, options, configure_firefox ) @@ -74,6 +74,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + domain = module.params.get('domain') options.firefox_dir = module.params.get('firefox_dir') diff --git a/roles/ipaclient/library/ipaclient_setup_krb5.py b/roles/ipaclient/library/ipaclient_setup_krb5.py index 367539b56c6203b62dd27daeebd7de28b052ea7c..9eb3e94873e9032252f47973f1d34abce83caa9f 100644 --- a/roles/ipaclient/library/ipaclient_setup_krb5.py +++ b/roles/ipaclient/library/ipaclient_setup_krb5.py @@ -81,7 +81,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( - sysrestore, paths, configure_krb5_conf, logger + setup_logging, sysrestore, paths, configure_krb5_conf, logger ) @@ -103,6 +103,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + servers = module.params.get('servers') domain = module.params.get('domain') realm = module.params.get('realm') diff --git a/roles/ipaclient/library/ipaclient_setup_nis.py b/roles/ipaclient/library/ipaclient_setup_nis.py index 1f1ba000502cb3d0503b6112956e1f59d4abd983..e04b87c671921ffa05d461a6834679e5a91a9bec 100644 --- a/roles/ipaclient/library/ipaclient_setup_nis.py +++ b/roles/ipaclient/library/ipaclient_setup_nis.py @@ -58,7 +58,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( - options, sysrestore, paths, configure_nisdomain + setup_logging, options, sysrestore, paths, configure_nisdomain ) @@ -72,6 +72,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + domain = module.params.get('domain') options.nisdomain = module.params.get('nisdomain') diff --git a/roles/ipaclient/library/ipaclient_setup_nss.py b/roles/ipaclient/library/ipaclient_setup_nss.py index d43eeb9ac86a2d3f81a5853ca9e2741489c4c0bd..c1bd17309789526a855f128a26326dafaf3461ba 100644 --- a/roles/ipaclient/library/ipaclient_setup_nss.py +++ b/roles/ipaclient/library/ipaclient_setup_nss.py @@ -138,6 +138,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( + setup_logging, 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, @@ -179,6 +180,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + cli_server = module.params.get('servers') cli_realm = module.params.get('realm') hostname = module.params.get('hostname') diff --git a/roles/ipaclient/library/ipaclient_setup_ntp.py b/roles/ipaclient/library/ipaclient_setup_ntp.py index acc48550d0415309228ec8499dc9d99acd7b85bf..b41a910b17d9720edb737c512b3f053c0190ebd2 100644 --- a/roles/ipaclient/library/ipaclient_setup_ntp.py +++ b/roles/ipaclient/library/ipaclient_setup_ntp.py @@ -67,6 +67,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( + setup_logging, options, sysrestore, paths, sync_time, logger, ipadiscovery, timeconf ) @@ -89,6 +90,8 @@ def main(): ) # module._ansible_debug = True + setup_logging() + options.ntp_servers = module.params.get('ntp_servers') options.ntp_pool = module.params.get('ntp_pool') options.no_ntp = module.params.get('no_ntp') diff --git a/roles/ipaclient/library/ipaclient_setup_ssh.py b/roles/ipaclient/library/ipaclient_setup_ssh.py index 2347c854da0a1d5598a516d42f22456a83eec1c8..f721b2a28be4ffd30eceec48ee8f492561286bae 100644 --- a/roles/ipaclient/library/ipaclient_setup_ssh.py +++ b/roles/ipaclient/library/ipaclient_setup_ssh.py @@ -68,6 +68,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( + setup_logging, options, sysrestore, paths, configure_ssh_config, configure_sshd_config ) @@ -85,6 +86,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + options.servers = module.params.get('servers') options.server = options.servers options.no_ssh = module.params.get('no_ssh') diff --git a/roles/ipaclient/library/ipaclient_setup_sssd.py b/roles/ipaclient/library/ipaclient_setup_sssd.py index 2afbdfb4945920532d53b9eca8fb32f09ac7a0e5..3fd767fca0f6640432b2a11369a313e883c35802 100644 --- a/roles/ipaclient/library/ipaclient_setup_sssd.py +++ b/roles/ipaclient/library/ipaclient_setup_sssd.py @@ -101,7 +101,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( - options, sysrestore, paths, configure_sssd_conf, logger + setup_logging, options, sysrestore, paths, configure_sssd_conf, logger ) @@ -130,6 +130,8 @@ def main(): # options.set_logger(ansible_log) module._ansible_debug = True + setup_logging() + cli_server = module.params.get('servers') cli_domain = module.params.get('domain') cli_realm = module.params.get('realm') diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py index 49e517e96557e907558ad7844924fc87444c07c7..8e1d11cf24d70967abf2fbc6da351f50d57274cb 100644 --- a/roles/ipaclient/library/ipaclient_test.py +++ b/roles/ipaclient/library/ipaclient_test.py @@ -199,6 +199,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( + setup_logging, paths, sysrestore, options, CheckedIPAddress, validate_domain_name, logger, x509, normalize_hostname, installer, version, ScriptError, CLIENT_INSTALL_ERROR, tasks, check_ldap_conf, timeconf, constants, @@ -290,6 +291,8 @@ def main(): ) # module._ansible_debug = True + setup_logging() + options.domain_name = module.params.get('domain') options.servers = module.params.get('servers') options.realm_name = module.params.get('realm') diff --git a/roles/ipaclient/library/ipaclient_test_keytab.py b/roles/ipaclient/library/ipaclient_test_keytab.py index d4a9f9f49c6a3ac54babc06a632532d766b94eb7..75ed10910fa0d8fe323c37ca136dd3fe4160616f 100644 --- a/roles/ipaclient/library/ipaclient_test_keytab.py +++ b/roles/ipaclient/library/ipaclient_test_keytab.py @@ -103,6 +103,7 @@ import tempfile from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_client import ( + setup_logging, SECURE_PATH, paths, kinit_keytab, run, GSSError, configure_krb5_conf ) @@ -121,6 +122,8 @@ def main(): ) module._ansible_debug = True + setup_logging() + servers = module.params.get('servers') domain = module.params.get('domain') realm = module.params.get('realm') diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py index d45171b2a84868d23e69a5a8c49a9b6533ec6871..48ef132528bb2323453e709431b289322b88d22c 100644 --- a/roles/ipaclient/module_utils/ansible_ipa_client.py +++ b/roles/ipaclient/module_utils/ansible_ipa_client.py @@ -259,9 +259,6 @@ if NUM_VERSION >= 40400: sssd_enable_ifp = None logger = logging.getLogger("ipa-client-install") - standard_logging_setup( - paths.IPACLIENT_INSTALL_LOG, verbose=False, debug=False, - filemode='a', console_format='%(message)s') root_logger = logger else: @@ -270,6 +267,12 @@ else: raise Exception("freeipa version '%s' is too old" % VERSION) +def setup_logging(): + standard_logging_setup( + paths.IPACLIENT_INSTALL_LOG, verbose=False, debug=False, + filemode='a', console_format='%(message)s') + + def ansible_module_get_parsed_ip_addresses(ansible_module, param='ip_addresses'): ip_addresses = ansible_module.params.get(param) diff --git a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py index 6a85dc1567e2da43a4249363e9fcda08ed73e8c2..acd553b78191dc88d03d0c88cfb5103a65d2db07 100644 --- a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py +++ b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py @@ -67,7 +67,7 @@ import six from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, paths, + AnsibleModuleLog, setup_logging, installer, paths, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_remote_api, api ) @@ -91,6 +91,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_create_ipa_conf.py b/roles/ipareplica/library/ipareplica_create_ipa_conf.py index 8a258f2ef56f7dec19b2b1ca12aa93efbf2d14df..3a85a6fea5303d642633806832dee66a3100b06c 100644 --- a/roles/ipareplica/library/ipareplica_create_ipa_conf.py +++ b/roles/ipareplica/library/ipareplica_create_ipa_conf.py @@ -137,7 +137,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, 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 @@ -186,6 +186,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py index 5b95a611d8c6311f2b3de9e1959807f1773ea422..c580ed5fbf2bcaa3be3e53084e975088c0b211d0 100644 --- a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py +++ b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py @@ -99,7 +99,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, installer, DN, paths, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, redirect_stdout, custodiainstance ) @@ -131,6 +131,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_ds_apply_updates.py b/roles/ipareplica/library/ipareplica_ds_apply_updates.py index e40717629a09aeef5aabab157f9b630069490c48..66aecd2680e688a639e4492a6680177fe27f58c0 100644 --- a/roles/ipareplica/library/ipareplica_ds_apply_updates.py +++ b/roles/ipareplica/library/ipareplica_ds_apply_updates.py @@ -100,7 +100,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, 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 @@ -133,6 +133,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py index ead7376b5202ac301d8c410598376eb974b7fc62..88c5f0b3e7a6cd53ad0bf1aebe954293be208ecd 100644 --- a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py +++ b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py @@ -97,7 +97,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, installer, DN, paths, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, replica_ds_init_info @@ -129,6 +129,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_enable_ipa.py b/roles/ipareplica/library/ipareplica_enable_ipa.py index 27ae28558756cce6807223da659dbf6ee4f8b67c..d18552b5656be92d9544d0a7e463a5e6c5544051 100644 --- a/roles/ipareplica/library/ipareplica_enable_ipa.py +++ b/roles/ipareplica/library/ipareplica_enable_ipa.py @@ -77,7 +77,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, 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 @@ -103,6 +103,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_install_ca_certs.py b/roles/ipareplica/library/ipareplica_install_ca_certs.py index 84466e6cc439f54502e4892afea6e2c0f25d727c..b93f0b9a77c79b987d3a8540f96a1fd5ea70621b 100644 --- a/roles/ipareplica/library/ipareplica_install_ca_certs.py +++ b/roles/ipareplica/library/ipareplica_install_ca_certs.py @@ -137,7 +137,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, 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, @@ -186,6 +186,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py index 6d09b6b287937c598a93b0f7b6444ebc9b45d1a0..1a73414d8add47c49aef29ea18e88886dc552f1d 100644 --- a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py +++ b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py @@ -86,7 +86,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, sysrestore, + AnsibleModuleLog, setup_logging, installer, DN, paths, sysrestore, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, api, krbinstance, redirect_stdout ) @@ -114,6 +114,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_master_password.py b/roles/ipareplica/library/ipareplica_master_password.py index 875a23d2cfc46370378830ee4bf2c24a6a3cd58b..02f9fd1505a0978ea1956dcc61e94d5b6c0960f3 100644 --- a/roles/ipareplica/library/ipareplica_master_password.py +++ b/roles/ipareplica/library/ipareplica_master_password.py @@ -53,7 +53,7 @@ password: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - ipa_generate_password + setup_logging, ipa_generate_password ) @@ -67,6 +67,7 @@ def main(): ) module._ansible_debug = True + setup_logging() master_password = module.params.get('master_password') diff --git a/roles/ipareplica/library/ipareplica_prepare.py b/roles/ipareplica/library/ipareplica_prepare.py index 85bc7ba96a9a8d5fe6fc72b49cfe9c4bafe7a273..0478d7de9c6ae95286bb179f7089f3eca13ada59 100644 --- a/roles/ipareplica/library/ipareplica_prepare.py +++ b/roles/ipareplica/library/ipareplica_prepare.py @@ -203,7 +203,7 @@ from ansible.module_utils.ansible_ipa_replica import ( 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, + check_domain_level_is_supported, errors, ScriptError, setup_logging, 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 @@ -278,6 +278,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_promote_openldap_conf.py b/roles/ipareplica/library/ipareplica_promote_openldap_conf.py index b68a5ecaf36622c79274166508f7212ee0f26a37..207794ced2c1fd86e0c6f4f5207afec3158360bc 100644 --- a/roles/ipareplica/library/ipareplica_promote_openldap_conf.py +++ b/roles/ipareplica/library/ipareplica_promote_openldap_conf.py @@ -71,7 +71,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, installer, DN, paths, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, redirect_stdout, promote_openldap_conf ) @@ -94,6 +94,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_promote_sssd.py b/roles/ipareplica/library/ipareplica_promote_sssd.py index a63f2e1bba56fe93a9263b64935d522131a56309..66d84d0d0be441372b50f39764ae009b2d12cbf5 100644 --- a/roles/ipareplica/library/ipareplica_promote_sssd.py +++ b/roles/ipareplica/library/ipareplica_promote_sssd.py @@ -71,7 +71,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, installer, DN, paths, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, redirect_stdout, promote_sssd ) @@ -94,6 +94,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_restart_kdc.py b/roles/ipareplica/library/ipareplica_restart_kdc.py index 3eff24b537df621ff3b3901b91ce7b73ee993c6c..b9c990060e51a127af2430eae9fd64bd581a15f9 100644 --- a/roles/ipareplica/library/ipareplica_restart_kdc.py +++ b/roles/ipareplica/library/ipareplica_restart_kdc.py @@ -83,7 +83,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, sysrestore, + AnsibleModuleLog, setup_logging, installer, DN, paths, sysrestore, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, service, krbinstance @@ -111,6 +111,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_adtrust.py b/roles/ipareplica/library/ipareplica_setup_adtrust.py index d269a40f77b877c02d6043f63385f150a9eab312..c830ebf2368a2fbbd1f042be669110b623938870 100644 --- a/roles/ipareplica/library/ipareplica_setup_adtrust.py +++ b/roles/ipareplica/library/ipareplica_setup_adtrust.py @@ -87,7 +87,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, sysrestore, + AnsibleModuleLog, setup_logging, installer, DN, paths, sysrestore, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, adtrust ) @@ -117,6 +117,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_ca.py b/roles/ipareplica/library/ipareplica_setup_ca.py index a07c9e4a57c44866b712870a62e8e24e199e24a6..850ceb964b82e14e4a7fde5342fa3cf26c160c91 100644 --- a/roles/ipareplica/library/ipareplica_setup_ca.py +++ b/roles/ipareplica/library/ipareplica_setup_ca.py @@ -113,7 +113,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, 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, @@ -153,6 +153,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_certmonger.py b/roles/ipareplica/library/ipareplica_setup_certmonger.py index b889d100e5c398dd292c556e27580119eb703d7b..982aab0a56a0f6bcc2f2848f52ea064f26b829c1 100644 --- a/roles/ipareplica/library/ipareplica_setup_certmonger.py +++ b/roles/ipareplica/library/ipareplica_setup_certmonger.py @@ -49,7 +49,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, redirect_stdout, configure_certmonger + AnsibleModuleLog, setup_logging, redirect_stdout, configure_certmonger ) @@ -61,6 +61,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_custodia.py b/roles/ipareplica/library/ipareplica_setup_custodia.py index 88da03b8d092b11076c49597bd303d48fad6e438..e9e4047a4cc81476b267efcc83eca6c6bd3f258a 100644 --- a/roles/ipareplica/library/ipareplica_setup_custodia.py +++ b/roles/ipareplica/library/ipareplica_setup_custodia.py @@ -95,7 +95,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, installer, DN, paths, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, custodiainstance ) @@ -126,6 +126,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_dns.py b/roles/ipareplica/library/ipareplica_setup_dns.py index 34e52364dbb099055013b49685debd65efc7c9a3..1557afe483ad520b6eee545da1bac43aee878c01 100644 --- a/roles/ipareplica/library/ipareplica_setup_dns.py +++ b/roles/ipareplica/library/ipareplica_setup_dns.py @@ -92,7 +92,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, 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 @@ -125,6 +125,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_ds.py b/roles/ipareplica/library/ipareplica_setup_ds.py index c0e156517ba9068786c87109e7f326f600863845..39e3348a9e6e85957f8c0263f518c895e84d58ac 100644 --- a/roles/ipareplica/library/ipareplica_setup_ds.py +++ b/roles/ipareplica/library/ipareplica_setup_ds.py @@ -152,7 +152,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, sysrestore, + AnsibleModuleLog, setup_logging, 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, @@ -205,6 +205,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_http.py b/roles/ipareplica/library/ipareplica_setup_http.py index 7b645f7be138cde162442adeb52752324c564f9e..a33587c766fcc6b7680d9e6ae555d52d0c40b934 100644 --- a/roles/ipareplica/library/ipareplica_setup_http.py +++ b/roles/ipareplica/library/ipareplica_setup_http.py @@ -93,7 +93,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, sysrestore, + AnsibleModuleLog, setup_logging, 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 @@ -123,6 +123,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_kra.py b/roles/ipareplica/library/ipareplica_setup_kra.py index 86b077a576e35f5c4128e40fe590fb4c36ad2c33..8e7b5f6f77065676fc8493e6cb2c6b17c92cf12d 100644 --- a/roles/ipareplica/library/ipareplica_setup_kra.py +++ b/roles/ipareplica/library/ipareplica_setup_kra.py @@ -137,7 +137,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, 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, @@ -186,6 +186,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_krb.py b/roles/ipareplica/library/ipareplica_setup_krb.py index 2d0180ed71bbc72f13b152b792d7fd8bbef83d66..0671df8baa5f20e841088c3508cd1b8becc2e512 100644 --- a/roles/ipareplica/library/ipareplica_setup_krb.py +++ b/roles/ipareplica/library/ipareplica_setup_krb.py @@ -78,7 +78,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, sysrestore, + AnsibleModuleLog, setup_logging, installer, DN, paths, sysrestore, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, api, redirect_stdout, install_krb ) @@ -103,6 +103,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_setup_otpd.py b/roles/ipareplica/library/ipareplica_setup_otpd.py index 4c5092d7b3f8c9b06d3de13543687c2ee7d490f3..1b8117d8e3210e8cc4a5a6a5ca7097622a4c7d39 100644 --- a/roles/ipareplica/library/ipareplica_setup_otpd.py +++ b/roles/ipareplica/library/ipareplica_setup_otpd.py @@ -83,7 +83,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, installer, DN, paths, + AnsibleModuleLog, setup_logging, installer, DN, paths, gen_env_boostrap_finalize_core, constants, api_bootstrap_finalize, gen_ReplicaConfig, gen_remote_api, api, redirect_stdout, otpdinstance, ipautil @@ -111,6 +111,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/library/ipareplica_test.py b/roles/ipareplica/library/ipareplica_test.py index ec33caef18b3bc25fa0b5e55bd2249b7220b6608..ebb1163f4145399c313ea5e1bec27d1392abc904 100644 --- a/roles/ipareplica/library/ipareplica_test.py +++ b/roles/ipareplica/library/ipareplica_test.py @@ -131,7 +131,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_replica import ( - AnsibleModuleLog, options, installer, paths, sysrestore, + AnsibleModuleLog, setup_logging, options, installer, paths, sysrestore, ansible_module_get_parsed_ip_addresses, service, redirect_stdout, create_ipa_conf, ipautil, x509, validate_domain_name, common_check, @@ -179,6 +179,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # get parameters # diff --git a/roles/ipareplica/module_utils/ansible_ipa_replica.py b/roles/ipareplica/module_utils/ansible_ipa_replica.py index ae05e45e00cbe1b7827fdef19841e5c96a0d911f..368ec6b6dbab2d56a9e4ad5a6a37326322d3c7ae 100644 --- a/roles/ipareplica/module_utils/ansible_ipa_replica.py +++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py @@ -140,10 +140,13 @@ else: logger = logging.getLogger("ipa-server-install") -# logger.setLevel(logging.DEBUG) -standard_logging_setup( - paths.IPAREPLICA_INSTALL_LOG, verbose=False, debug=False, - filemode='a', console_format='%(message)s') + + +def setup_logging(): + # logger.setLevel(logging.DEBUG) + standard_logging_setup( + paths.IPAREPLICA_INSTALL_LOG, verbose=False, debug=False, + filemode='a', console_format='%(message)s') @contextlib_contextmanager diff --git a/roles/ipaserver/library/ipaserver_enable_ipa.py b/roles/ipaserver/library/ipaserver_enable_ipa.py index 5f50213ad529cb542bbdb5d0ca25696b9db4318a..00bf3da60d7648045d678bbdc2a48341e886968f 100644 --- a/roles/ipaserver/library/ipaserver_enable_ipa.py +++ b/roles/ipaserver/library/ipaserver_enable_ipa.py @@ -57,7 +57,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, paths, api, sysrestore, tasks, + AnsibleModuleLog, setup_logging, options, paths, api, sysrestore, tasks, service, bindinstance, redirect_stdout, services ) @@ -72,6 +72,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################# diff --git a/roles/ipaserver/library/ipaserver_load_cache.py b/roles/ipaserver/library/ipaserver_load_cache.py index 20d335ca8403b50b241ce87cfb0e3271f92ca979..ad29455c79391269babae87b4a120c3cf68aed75 100644 --- a/roles/ipaserver/library/ipaserver_load_cache.py +++ b/roles/ipaserver/library/ipaserver_load_cache.py @@ -53,7 +53,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - options, paths, read_cache + setup_logging, options, paths, read_cache ) @@ -66,6 +66,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() # set values ############################################################ diff --git a/roles/ipaserver/library/ipaserver_master_password.py b/roles/ipaserver/library/ipaserver_master_password.py index 0bb444e17582b97f4072866f5cdd35b2d37ee2fc..bf9c52b0fbbe1d1bf9de413d0f71cd3a3dd73839 100644 --- a/roles/ipaserver/library/ipaserver_master_password.py +++ b/roles/ipaserver/library/ipaserver_master_password.py @@ -58,7 +58,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - options, paths, read_cache, ipa_generate_password + setup_logging, options, paths, read_cache, ipa_generate_password ) @@ -73,6 +73,7 @@ def main(): ) module._ansible_debug = True + setup_logging() options.dm_password = module.params.get('dm_password') options.master_password = module.params.get('master_password') diff --git a/roles/ipaserver/library/ipaserver_prepare.py b/roles/ipaserver/library/ipaserver_prepare.py index 68dadc5e83c6ebd1c7d7112b87dee735186c7bb2..1341abfbd8555149bf5e34de91ba0ddc33bbf44f 100644 --- a/roles/ipaserver/library/ipaserver_prepare.py +++ b/roles/ipaserver/library/ipaserver_prepare.py @@ -157,7 +157,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, sysrestore, paths, + AnsibleModuleLog, setup_logging, 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, @@ -219,6 +219,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # initialize return values for flake ############################ diff --git a/roles/ipaserver/library/ipaserver_set_ds_password.py b/roles/ipaserver/library/ipaserver_set_ds_password.py index da6ef68151388adb4589f1dbefbe32a38f6c4a14..164a0ac5d1cc3977fa1454e52e040362bbdaad90 100644 --- a/roles/ipaserver/library/ipaserver_set_ds_password.py +++ b/roles/ipaserver/library/ipaserver_set_ds_password.py @@ -107,7 +107,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( MAX_DOMAIN_LEVEL, AnsibleModuleLog, options, sysrestore, paths, - api_Backend_ldap2, ds_init_info, redirect_stdout + api_Backend_ldap2, ds_init_info, redirect_stdout, setup_logging ) @@ -141,6 +141,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values #################################################### diff --git a/roles/ipaserver/library/ipaserver_setup_adtrust.py b/roles/ipaserver/library/ipaserver_setup_adtrust.py index 4838f2baef0e6c5af6f5aaf038a938470bbf5b3d..341cb4e2a651fa6b5e55497dc950a59151621218 100644 --- a/roles/ipaserver/library/ipaserver_setup_adtrust.py +++ b/roles/ipaserver/library/ipaserver_setup_adtrust.py @@ -73,7 +73,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, sysrestore, paths, + AnsibleModuleLog, setup_logging, options, sysrestore, paths, api_Backend_ldap2, redirect_stdout, adtrust, api ) @@ -96,6 +96,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values #################################################### diff --git a/roles/ipaserver/library/ipaserver_setup_ca.py b/roles/ipaserver/library/ipaserver_setup_ca.py index 374b20b7dac2fe9ef31ce69dc169bc826fe2209c..524d1aa9edebfbb5f56d3a5ede364ad148d0bb95 100644 --- a/roles/ipaserver/library/ipaserver_setup_ca.py +++ b/roles/ipaserver/library/ipaserver_setup_ca.py @@ -160,7 +160,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, sysrestore, paths, + AnsibleModuleLog, setup_logging, options, sysrestore, paths, ansible_module_get_parsed_ip_addresses, api_Backend_ldap2, redirect_stdout, ca, installutils, ds_init_info, custodiainstance, write_cache, x509 @@ -214,6 +214,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################ diff --git a/roles/ipaserver/library/ipaserver_setup_custodia.py b/roles/ipaserver/library/ipaserver_setup_custodia.py index 2514e06fc6eefdbc1025ec8aa7610422d6427e40..565020b83981d06ff593b761a778b2246610626b 100644 --- a/roles/ipaserver/library/ipaserver_setup_custodia.py +++ b/roles/ipaserver/library/ipaserver_setup_custodia.py @@ -57,7 +57,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, + setup_logging, AnsibleModuleLog, options, api_Backend_ldap2, custodiainstance, redirect_stdout ) @@ -74,6 +74,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################ diff --git a/roles/ipaserver/library/ipaserver_setup_dns.py b/roles/ipaserver/library/ipaserver_setup_dns.py index ae1429a62cd5cbf09fcc303fb43adb3fc9eb2d10..396b43948ec2c8f55250d301854989e73f5be074 100644 --- a/roles/ipaserver/library/ipaserver_setup_dns.py +++ b/roles/ipaserver/library/ipaserver_setup_dns.py @@ -84,7 +84,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, paths, dns, + AnsibleModuleLog, setup_logging, options, paths, dns, ansible_module_get_parsed_ip_addresses, sysrestore, api_Backend_ldap2, redirect_stdout, bindinstance ) @@ -114,6 +114,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################ diff --git a/roles/ipaserver/library/ipaserver_setup_ds.py b/roles/ipaserver/library/ipaserver_setup_ds.py index 5ce35f4133f957ef83a60272a8e6e1e9b18d0227..7e327405765caa03d1402a2e4d8d3182ef9cbeca 100644 --- a/roles/ipaserver/library/ipaserver_setup_ds.py +++ b/roles/ipaserver/library/ipaserver_setup_ds.py @@ -103,7 +103,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, sysrestore, paths, + AnsibleModuleLog, setup_logging, options, sysrestore, paths, api_Backend_ldap2, redirect_stdout, api, NUM_VERSION, tasks, dsinstance, ntpinstance, IPAAPI_USER ) @@ -138,6 +138,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################ diff --git a/roles/ipaserver/library/ipaserver_setup_http.py b/roles/ipaserver/library/ipaserver_setup_http.py index a29a0447e18ff3479e7a2ff7220330d5e3217edd..0518d0886fee1762ec5d686429e44add0ee8c29f 100644 --- a/roles/ipaserver/library/ipaserver_setup_http.py +++ b/roles/ipaserver/library/ipaserver_setup_http.py @@ -149,7 +149,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, sysrestore, paths, + AnsibleModuleLog, setup_logging, options, sysrestore, paths, ansible_module_get_parsed_ip_addresses, api_Backend_ldap2, redirect_stdout, ds_init_info, krbinstance, httpinstance, ca, service, tasks @@ -205,6 +205,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################ diff --git a/roles/ipaserver/library/ipaserver_setup_kra.py b/roles/ipaserver/library/ipaserver_setup_kra.py index ebf03b09860da5d0fe61baa98adc9fd626ad9e3d..5296c09efc7ca1db061f498d2b945b5067b75f6e 100644 --- a/roles/ipaserver/library/ipaserver_setup_kra.py +++ b/roles/ipaserver/library/ipaserver_setup_kra.py @@ -66,7 +66,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, + AnsibleModuleLog, setup_logging, options, api_Backend_ldap2, redirect_stdout, api, custodiainstance, kra ) @@ -85,6 +85,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values #################################################### diff --git a/roles/ipaserver/library/ipaserver_setup_krb.py b/roles/ipaserver/library/ipaserver_setup_krb.py index 8690edd7cb6bf5f7b52767c7d875ab4bfeb48fc0..06256ff1167cb7ec408755475c5cd5400a0d5c21 100644 --- a/roles/ipaserver/library/ipaserver_setup_krb.py +++ b/roles/ipaserver/library/ipaserver_setup_krb.py @@ -121,7 +121,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, sysrestore, paths, + AnsibleModuleLog, setup_logging, options, sysrestore, paths, ansible_module_get_parsed_ip_addresses, api_Backend_ldap2, redirect_stdout, krbinstance ) @@ -165,6 +165,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################ diff --git a/roles/ipaserver/library/ipaserver_setup_ntp.py b/roles/ipaserver/library/ipaserver_setup_ntp.py index 2e635ab6c56453c1ac65bf3074214d0ba5fd3df3..ab1fde7ef0c4e99ab0b8968ecb14274ed5a295ba 100644 --- a/roles/ipaserver/library/ipaserver_setup_ntp.py +++ b/roles/ipaserver/library/ipaserver_setup_ntp.py @@ -56,7 +56,7 @@ import inspect from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, sysrestore, paths, + AnsibleModuleLog, setup_logging, options, sysrestore, paths, redirect_stdout, time_service, sync_time, ntpinstance, timeconf ) @@ -70,6 +70,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################ diff --git a/roles/ipaserver/library/ipaserver_setup_otpd.py b/roles/ipaserver/library/ipaserver_setup_otpd.py index 12a87567ef3bacc263ab7670fd7f71f442274e12..e72d27b51c92734caa297d0af928c995a8a9ed16 100644 --- a/roles/ipaserver/library/ipaserver_setup_otpd.py +++ b/roles/ipaserver/library/ipaserver_setup_otpd.py @@ -57,7 +57,7 @@ RETURN = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, + AnsibleModuleLog, setup_logging, options, api_Backend_ldap2, redirect_stdout, otpdinstance, ipautil ) @@ -73,6 +73,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values #################################################### diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py index 5668231f1e4f33882f4530513ea1f3d40a717a6f..9a7b70bcbf66a65c09f182fe30e62228e82d5487 100644 --- a/roles/ipaserver/library/ipaserver_test.py +++ b/roles/ipaserver/library/ipaserver_test.py @@ -212,8 +212,8 @@ import random from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.ansible_ipa_server import ( - AnsibleModuleLog, options, adtrust_imported, kra_imported, PKIIniLoader, - MIN_DOMAIN_LEVEL, MAX_DOMAIN_LEVEL, check_zone_overlap, + AnsibleModuleLog, setup_logging, options, adtrust_imported, kra_imported, + PKIIniLoader, 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, @@ -302,6 +302,7 @@ def main(): ) ansible_module._ansible_debug = True + setup_logging() ansible_log = AnsibleModuleLog(ansible_module) # set values ############################################################ diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py index aad8f1d74c0d5f3c835825136534953c33c1b283..244bc75d2ad99b524b18e17f31d68e337a939c8c 100644 --- a/roles/ipaserver/module_utils/ansible_ipa_server.py +++ b/roles/ipaserver/module_utils/ansible_ipa_server.py @@ -144,10 +144,13 @@ else: logger = logging.getLogger("ipa-server-install") -# logger.setLevel(logging.DEBUG) -standard_logging_setup( - paths.IPASERVER_INSTALL_LOG, verbose=False, debug=False, - filemode='a', console_format='%(message)s') + + +def setup_logging(): + # logger.setLevel(logging.DEBUG) + standard_logging_setup( + paths.IPASERVER_INSTALL_LOG, verbose=False, debug=False, + filemode='a', console_format='%(message)s') @contextlib_contextmanager