starlingx
/
config
Code Issues Proposed changes

Fix upgrades that use restore procedure 

The restore procedure was recently changed,
and it has additional steps.
Upgrades that are based on backup and restore
procedure don't automate the `complete the restore`
additional step.
In this fix, we automate this step when we do a
`system upgrade-complete` command.

Closes-bug: 1906557
Change-Id: I93db335ff058f987ed5f10ecac1aa402fe82032f
Signed-off-by: Mihnea Saracin <Mihnea.Saracin@windriver.com>
This commit is contained in:
Mihnea Saracin 2020-12-04 11:35:23 +02:00
parent bb4af75c33
commit b339eb0005
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -9590,6 +9590,11 @@ class ConductorManager(service.PeriodicService):
raise exception.SysinvException(
_("Unable to complete upgrade: Upgrade not in %s state.")
% constants.UPGRADE_COMPLETING)
# Complete the restore procedure
if tsc.system_mode == constants.SYSTEM_MODE_SIMPLEX:
self.complete_restore(context)
# Force all host_upgrade entries to use the new load
# In particular we may have host profiles created in the from load
# that we need to update before we can delete the load.