diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-05-07 11:03:27 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-05-19 12:43:04 +0000 |
| commit | 7660f40e2bedf6dce5c569f1be64a80934a952a3 (patch) | |
| tree | eec5c07c506823eefbc63927d39a8236cab9a07b /ipaserver/install | |
| parent | 273fd057a3be797a05d6c7f34fd619d3dfa09c37 (diff) | |
| download | freeipa-7660f40e2bedf6dce5c569f1be64a80934a952a3.tar.gz freeipa-7660f40e2bedf6dce5c569f1be64a80934a952a3.tar.xz freeipa-7660f40e2bedf6dce5c569f1be64a80934a952a3.zip | |
Server Upgrade: Do not start DS if it was stopped before upgrade
https://fedorahosted.org/freeipa/ticket/4904
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/upgradeinstance.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 1466450b2..ad9839e6b 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -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) |