IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade process should not crash on named restart

Browse Source 
When either dirsrv or krb5kdc is down, named service restart in
ipa-upgradeconfig will fail and cause a crash of the whole upgrade
process.

Rather only report a failure to restart the service and continue
with the upgrade as it does not need the named service running. Do
the same precaution for pki-ca service restart.

https://fedorahosted.org/freeipa/ticket/3350
This commit is contained in:
Martin Kosek 2013-01-15 16:33:22 +01:00
parent ed84963927
commit 476aacd699
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install/tools/ipa-upgradeconfig
View File

@ -706,12 +706,19 @@ def main():
if changed_psearch or changed_autoincrement: if changed_psearch or changed_autoincrement:
# configuration has changed, restart the name server # configuration has changed, restart the name server
root_logger.info('Changes to named.conf have been made, restart named') root_logger.info('Changes to named.conf have been made, restart named')
bindinstance.BindInstance(fstore).restart() bind = bindinstance.BindInstance(fstore)
try:
bind.restart()
except ipautil.CalledProcessError, e:
root_logger.error("Failed to restart %s: %s", bind.service_name, e)
ca_restart = ca_restart or enable_certificate_renewal(ca) or upgrade_ipa_profile(ca, api.env.domain, fqdn) ca_restart = ca_restart or enable_certificate_renewal(ca) or upgrade_ipa_profile(ca, api.env.domain, fqdn)
if ca_restart: if ca_restart:
root_logger.info('pki-ca configuration changed, restart pki-ca') root_logger.info('pki-ca configuration changed, restart pki-ca')
ca.restart(dogtag.configured_constants().PKI_INSTANCE_NAME) try:
ca.restart(dogtag.configured_constants().PKI_INSTANCE_NAME)
except ipautil.CalledProcessError, e:
root_logger.error("Failed to restart %s: %s", ca.service_name, e)
if __name__ == '__main__': if __name__ == '__main__':
installutils.run_script(main, operation_name='ipa-upgradeconfig') installutils.run_script(main, operation_name='ipa-upgradeconfig')