IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-27 00:26:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use debug logger in ntpd_cleanup()

Browse Source 
ipa-server-update shows spurious warnings when updating a server, e.g.

  No such file name in the index

  Warning: NTP service entry was not found in LDAP.

Lower all log levels in ntpd_cleanup() to debug to not confuse the user.

Fixes: https://pagure.io/freeipa/issue/7829
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes 2019-01-08 10:52:26 +01:00
parent 64be3141da
commit 3bed3d4ddb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/install/server/upgrade.py
View File

@ -1670,20 +1670,20 @@ def ntpd_cleanup(fqdn, fstore):
instance.disable()
instance.stop()
except Exception as e:
logger.info("Service ntpd was not disabled or stopped")
logger.debug("Service ntpd was not disabled or stopped")
for ntpd_file in [paths.NTP_CONF, paths.NTP_STEP_TICKERS,
paths.SYSCONFIG_NTPD]:
try:
fstore.restore_file(ntpd_file)
except ValueError as e:
logger.warning(e)
logger.debug(e)
try:
api.Backend.ldap2.delete_entry(DN(('cn', 'NTP'), ('cn', fqdn),
api.env.container_masters))
except ipalib.errors.NotFound:
logger.warning("Warning: NTP service entry was not found in LDAP.")
logger.debug("NTP service entry was not found in LDAP.")
ntp_role_instance = servroles.ServiceBasedRole(
u"ntp_server_server",