From dc32238b191a84f0677e2d3ae47f5b319946faf9 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Tue, 18 Aug 2015 18:01:09 +0200 Subject: [PATCH] Server Upgrade: Start DS before CA is started. https://fedorahosted.org/freeipa/ticket/5232 Reviewed-By: Jan Cholasta --- ipaserver/install/server/upgrade.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index 692d0c77e0683f4ad35ebbc14d5a34decc098deb..a57682a4bbdaab2a15b4e415223e2f5faa67ba73 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1328,6 +1328,13 @@ def upgrade_configuration(): raise RuntimeError("ipa-rewrite.conf doesn't exists (is this server?)") # Ok, we are an IPA server, do the additional tests + ds_serverid = installutils.realm_to_serverid(api.env.realm) + ds = dsinstance.DsInstance() + + # start DS, CA will not start without running DS, and cause error + ds_running = ds.is_running() + if not ds_running: + ds.start(ds_serverid) check_certs() @@ -1359,7 +1366,6 @@ def upgrade_configuration(): 'ca.crl.MasterCRL.enableCRLUpdates', '=') sub_dict['CLONE']='#' if crl.lower() == 'true' else '' - ds_serverid = installutils.realm_to_serverid(api.env.realm) ds_dirname = dsinstance.config_dirname(ds_serverid) upgrade_file(sub_dict, paths.HTTPD_IPA_CONF, @@ -1396,7 +1402,6 @@ def upgrade_configuration(): http.change_mod_nss_port_from_http() http.configure_certmonger_renewal_guard() - ds = dsinstance.DsInstance() ds.configure_dirsrv_ccache() # ldap2 connection is not valid after DS restart, close connection otherwise @@ -1526,6 +1531,11 @@ def upgrade_configuration(): set_sssd_domain_option('ipa_server_mode', 'True') + if ds_running and not ds.is_running(): + ds.start(ds_serverid) + elif not ds_running and ds.is_running(): + ds.stop(ds_serverid) + def upgrade_check(options): try: -- 2.4.3