From 0b5b5756c70402ed2e5bc92e0b83118c200d2222 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Fri, 5 Apr 2019 18:11:24 +0200
Subject: [PATCH] Revert "ipa[client,replica,server]: Make sure that installer
logs are created"
The call of standard_logging_setup results in verbose and debug output in
the ansible modules. This needs to be done in an altenative way.
This reverts commit 2113c79111031137f0076f03bdca9748056eecca.
---
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, 6 insertions(+), 13 deletions(-)
diff --git a/roles/ipaclient/library/ipaclient_setup_nss.py b/roles/ipaclient/library/ipaclient_setup_nss.py
index 2778ce9e..4c12ae1f 100644
--- a/roles/ipaclient/library/ipaclient_setup_nss.py
+++ b/roles/ipaclient/library/ipaclient_setup_nss.py
@@ -129,6 +129,9 @@ 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 b36d6104..c8870a35 100644
--- a/roles/ipaclient/module_utils/ansible_ipa_client.py
+++ b/roles/ipaclient/module_utils/ansible_ipa_client.py
@@ -225,9 +225,6 @@ 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 d876a51b..daca9dc6 100644
--- a/roles/ipareplica/module_utils/ansible_ipa_replica.py
+++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py
@@ -65,7 +65,6 @@ 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
@@ -109,10 +108,8 @@ else:
logger = logging.getLogger("ipa-server-install")
-#logger.setLevel(logging.DEBUG)
-standard_logging_setup(
- paths.IPAREPLICA_INSTALL_LOG, verbose=True, debug=False,
- filemode='a', console_format='%(message)s')
+logger.setLevel(logging.DEBUG)
+
@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 240f36e7..6713ae8c 100644
--- a/roles/ipaserver/module_utils/ansible_ipa_server.py
+++ b/roles/ipaserver/module_utils/ansible_ipa_server.py
@@ -56,7 +56,6 @@ 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 (
@@ -133,10 +132,7 @@ else:
logger = logging.getLogger("ipa-server-install")
-#logger.setLevel(logging.DEBUG)
-standard_logging_setup(
- paths.IPASERVER_INSTALL_LOG, verbose=True, debug=False,
- filemode='a', console_format='%(message)s')
+logger.setLevel(logging.DEBUG)
@contextlib_contextmanager
--
GitLab