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

Server Upgrade: Do not start DS if it was stopped before upgrade

Browse Source 
https://fedorahosted.org/freeipa/ticket/4904

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Martin Basti 2015-05-07 11:03:27 +02:00 committed by Jan Cholasta
parent 273fd057a3
commit 7660f40e2b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/install/upgradeinstance.py
View File

@ -183,7 +183,9 @@ class IPAUpgrade(service.Service):
super(IPAUpgrade, self).stop(self.serverid)
def create_instance(self):
self.step("stopping directory server", self.__stop_instance)
ds_running = super(IPAUpgrade, self).is_running()
if ds_running:
self.step("stopping directory server", self.__stop_instance)
self.step("saving configuration", self.__save_config)
self.step("disabling listeners", self.__disable_listeners)
self.step("enabling DS global lock", self.__enable_ds_global_write_lock)
@ -196,8 +198,8 @@ class IPAUpgrade(service.Service):
run_after_failure=True)
self.step("restoring configuration", self.__restore_config,
run_after_failure=True)
self.step("starting directory server", self.start)
if ds_running:
self.step("starting directory server", self.start)
self.start_creation(start_message="Upgrading IPA:",
show_service_name=False)