Merge pull request #233 from t-woerner/setup_logging

ipa[server,replica,client]: setup_logging wrapper for standard_logging setup

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')

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')

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)

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')

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')

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)

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')

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')
 

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')

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')
 

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')

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')

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')

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')

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')

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')

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)

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 #

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 #

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 #