3979c73861
- Resolves: RHEL-53500 adtrustinstance only prints issues in check_inst() and does not log them - Resolves: RHEL-52306 Unconditionally add MS-PAC to global config - Resolves: RHEL-52300 RFE - Keep the configured value for the "nsslapd-ignore-time-skew" after a "force-sync" - Resolves: RHEL-52222 ipa-replica/server-install with softhsm needs to check permission/ownership of /var/lib/softhsm/tokens to avoid install failure - Resolves: RHEL-51944 Include latest fixes in python3-ipatests packages - Resolves: RHEL-50804 ipa-migrate -Z with invalid cert options fails with 'ValueError: option error' - Resolves: RHEL-49602 misleading warning for missing ipa-selinux-nfast package on luna hsm h/w - Resolves: RHEL-27856 'Unable to log in as uid=admin-replica.testrealm.test,ou=people,o=ipaca' during replica install Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
From e83d949c7f1734dff70379e360e9bbf626149c61 Mon Sep 17 00:00:00 2001
|
|
From: Rob Crittenden <rcritten@redhat.com>
|
|
Date: Fri, 19 Jul 2024 14:24:15 -0400
|
|
Subject: [PATCH] Log errors reported by adtrustinstance.check_inst() using
|
|
logger
|
|
|
|
It previously only printed the issue which made troubleshooting
|
|
after the fact difficult. Using logger.error() provides the same
|
|
visual functionality but also logs to the server install log.
|
|
|
|
Fixes: https://pagure.io/freeipa/issue/9637
|
|
|
|
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
|
|
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
---
|
|
ipaserver/install/adtrustinstance.py | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
|
|
index 2ff68dfb46371a6118eb67515347eb762a37e1ec..fd5a5a282fa2a222de85c6b29d8d9621b53c95d2 100644
|
|
--- a/ipaserver/install/adtrustinstance.py
|
|
+++ b/ipaserver/install/adtrustinstance.py
|
|
@@ -65,8 +65,8 @@ and re-run ipa-adtrust-instal again afterwards.
|
|
def check_inst():
|
|
for smbfile in [paths.SMBD, paths.NET]:
|
|
if not os.path.exists(smbfile):
|
|
- print("%s was not found on this system" % smbfile)
|
|
- print("Please install the 'samba' packages and " \
|
|
+ logger.error("%s was not found on this system", smbfile)
|
|
+ logger.error("Please install the 'samba' packages and "
|
|
"start the installation again")
|
|
return False
|
|
|
|
@@ -74,9 +74,10 @@ def check_inst():
|
|
# by looking for the file /usr/share/ipa/smb.conf.empty
|
|
if not os.path.exists(os.path.join(paths.USR_SHARE_IPA_DIR,
|
|
"smb.conf.empty")):
|
|
- print("AD Trust requires the '%s' package" %
|
|
+ logger.error("AD Trust requires the '%s' package",
|
|
constants.IPA_ADTRUST_PACKAGE_NAME)
|
|
- print("Please install the package and start the installation again")
|
|
+ logger.error(
|
|
+ "Please install the package and start the installation again")
|
|
return False
|
|
|
|
#TODO: Add check for needed samba4 libraries
|
|
--
|
|
2.45.2
|
|
|