diff options
| author | Fraser Tweedale <ftweedal@redhat.com> | 2016-06-15 22:12:52 +1000 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-06-15 17:17:22 +0200 |
| commit | 01795fca831ca5ce59a56755d261cb3100d6c3d4 (patch) | |
| tree | e40435102d210ee1beb1a4b134731931892be574 /ipaserver | |
| parent | d26e42ffb065cc524c63d65d87c2a2b5d943c54a (diff) | |
| download | freeipa-01795fca831ca5ce59a56755d261cb3100d6c3d4.tar.gz freeipa-01795fca831ca5ce59a56755d261cb3100d6c3d4.tar.xz freeipa-01795fca831ca5ce59a56755d261cb3100d6c3d4.zip | |
upgrade: do not try to start CA if not configured
The upgrade script always attempts to start the CA, even on
instances where the CA is not configured. Add guards.
Fixes: https://fedorahosted.org/freeipa/ticket/5958
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/server/upgrade.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index 0c5f32d95..044e36494 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1552,10 +1552,11 @@ def upgrade_configuration(): ) upgrade_pki(ca, fstore) - # several upgrade steps require running CA + # several upgrade steps require running CA. If CA is configured, # always run ca.start() because we need to wait until CA is really ready # by checking status using http - ca.start('pki-tomcat') + if ca.is_configured(): + ca.start('pki-tomcat') certmonger_service = services.knownservices.certmonger if ca.is_configured() and not certmonger_service.is_running(): @@ -1736,10 +1737,11 @@ def upgrade_configuration(): elif not ds_running and ds.is_running(): ds.stop(ds_serverid) - if ca_running and not ca.is_running(): - ca.start('pki-tomcat') - elif not ca_running and ca.is_running(): - ca.stop('pki-tomcat') + if ca.is_configured(): + if ca_running and not ca.is_running(): + ca.start('pki-tomcat') + elif not ca_running and ca.is_running(): + ca.stop('pki-tomcat') def upgrade_check(options): |