internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-08-01 04:14:42 +00:00
Code Issues Projects Releases Wiki Activity

Revert "ipa[client,replica,server]: Make sure that installer logs are created"

Browse Source 
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 2113c79111.
This commit is contained in:
Thomas Woerner
2019-04-05 18:11:24 +02:00
parent 387f555560
commit 0b5b5756c7
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/ipaclient/library/ipaclient_setup_nss.py
View File

@@ -129,6 +129,9 @@ def main():
fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
statestore = sysrestore.StateFile(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 os.environ['KRB5CCNAME'] = paths.IPA_DNS_CCACHE

3
roles/ipaclient/module_utils/ansible_ipa_client.py
View File

@@ -225,9 +225,6 @@ if NUM_VERSION >= 40400:
sssd_enable_ifp = None sssd_enable_ifp = None
logger = logging.getLogger("ipa-client-install") 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 root_logger = logger
else: else:

7
roles/ipareplica/module_utils/ansible_ipa_replica.py
View File

@@ -65,7 +65,6 @@ if NUM_VERSION >= 40600:
from ipapython.certdb import IPA_CA_TRUST_FLAGS, EXTERNAL_CA_TRUST_FLAGS from ipapython.certdb import IPA_CA_TRUST_FLAGS, EXTERNAL_CA_TRUST_FLAGS
from ipapython.dn import DN from ipapython.dn import DN
from ipapython.admintool import ScriptError from ipapython.admintool import ScriptError
from ipapython.ipa_log_manager import standard_logging_setup
from ipaplatform import services from ipaplatform import services
from ipaplatform.tasks import tasks from ipaplatform.tasks import tasks
from ipaplatform.paths import paths from ipaplatform.paths import paths
@@ -109,10 +108,8 @@ else:
logger = logging.getLogger("ipa-server-install") 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 @contextlib_contextmanager
def redirect_stdout(f): def redirect_stdout(f):

6
roles/ipaserver/module_utils/ansible_ipa_server.py
View File

@@ -56,7 +56,6 @@ if NUM_VERSION >= 40500:
from ipaclient.install.ipachangeconf import IPAChangeConf from ipaclient.install.ipachangeconf import IPAChangeConf
from ipalib.install import certmonger, sysrestore from ipalib.install import certmonger, sysrestore
from ipapython import ipautil from ipapython import ipautil
from ipapython.ipa_log_manager import standard_logging_setup
if NUM_VERSION < 40600: if NUM_VERSION < 40600:
from ipapython.ipa_log_manager import root_logger from ipapython.ipa_log_manager import root_logger
from ipapython.ipautil import ( from ipapython.ipautil import (
@@ -133,10 +132,7 @@ else:
logger = logging.getLogger("ipa-server-install") 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 @contextlib_contextmanager