From 2113c79111031137f0076f03bdca9748056eecca Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 3 Apr 2019 14:20:18 +0200
Subject: [PATCH] ipa[client,replica,server]: Make sure that installer logs are
 created

The installer logs have not been created using the ansible ipaclient,
ipareplica and ipaserver roles. This has been fixed and the installer
logs are created now.
---
 roles/ipaclient/library/ipaclient_setup_nss.py       | 3 ---
 roles/ipaclient/module_utils/ansible_ipa_client.py   | 3 +++
 roles/ipareplica/module_utils/ansible_ipa_replica.py | 7 +++++--
 roles/ipaserver/module_utils/ansible_ipa_server.py   | 6 +++++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/roles/ipaclient/library/ipaclient_setup_nss.py b/roles/ipaclient/library/ipaclient_setup_nss.py
index 4c12ae1f..2778ce9e 100644
--- a/roles/ipaclient/library/ipaclient_setup_nss.py
+++ b/roles/ipaclient/library/ipaclient_setup_nss.py
@@ -129,9 +129,6 @@ def main():
 
     fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
     statestore = sysrestore.StateFile(paths.IPA_CLIENT_SYSRESTORE)
-    standard_logging_setup(
-        paths.IPACLIENT_INSTALL_LOG, verbose=True, debug=False,
-        filemode='a', console_format='%(message)s')
 
     os.environ['KRB5CCNAME'] = paths.IPA_DNS_CCACHE
     
diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py
index c8870a35..b36d6104 100644
--- a/roles/ipaclient/module_utils/ansible_ipa_client.py
+++ b/roles/ipaclient/module_utils/ansible_ipa_client.py
@@ -225,6 +225,9 @@ if NUM_VERSION >= 40400:
         sssd_enable_ifp = None
 
     logger = logging.getLogger("ipa-client-install")
+    standard_logging_setup(
+        paths.IPACLIENT_INSTALL_LOG, verbose=True, debug=False,
+        filemode='a', console_format='%(message)s')
     root_logger = logger
 
 else:
diff --git a/roles/ipareplica/module_utils/ansible_ipa_replica.py b/roles/ipareplica/module_utils/ansible_ipa_replica.py
index b5fdd445..312c6aa5 100644
--- a/roles/ipareplica/module_utils/ansible_ipa_replica.py
+++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py
@@ -64,6 +64,7 @@ if NUM_VERSION >= 40600:
     from ipapython.certdb import IPA_CA_TRUST_FLAGS, EXTERNAL_CA_TRUST_FLAGS
     from ipapython.dn import DN
     from ipapython.admintool import ScriptError
+    from ipapython.ipa_log_manager import standard_logging_setup
     from ipaplatform import services
     from ipaplatform.tasks import tasks
     from ipaplatform.paths import paths
@@ -119,8 +120,10 @@ else:
 
 
 logger = logging.getLogger("ipa-server-install")
-logger.setLevel(logging.DEBUG)
-
+#logger.setLevel(logging.DEBUG)
+standard_logging_setup(
+    paths.IPAREPLICA_INSTALL_LOG, verbose=True, debug=False,
+    filemode='a', console_format='%(message)s')
 
 @contextlib_contextmanager
 def redirect_stdout(f):
diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py
index d059f3ab..58a26435 100644
--- a/roles/ipaserver/module_utils/ansible_ipa_server.py
+++ b/roles/ipaserver/module_utils/ansible_ipa_server.py
@@ -55,6 +55,7 @@ if NUM_VERSION >= 40500:
         from ipaclient.install.ipachangeconf import IPAChangeConf
     from ipalib.install import certmonger, sysrestore
     from ipapython import ipautil
+    from ipapython.ipa_log_manager import standard_logging_setup
     if NUM_VERSION < 40600:
         from ipapython.ipa_log_manager import root_logger
     from ipapython.ipautil import (
@@ -129,7 +130,10 @@ else:
 
 
 logger = logging.getLogger("ipa-server-install")
-logger.setLevel(logging.DEBUG)
+#logger.setLevel(logging.DEBUG)
+standard_logging_setup(
+    paths.IPASERVER_INSTALL_LOG, verbose=True, debug=False,
+    filemode='a', console_format='%(message)s')
 
 
 @contextlib_contextmanager