starlingx/update
Code Issues Proposed changes

Merge "deploy precheck circular dependency"

Browse Source
This commit is contained in:
Zuul
2024-08-27 17:48:36 +00:00
committed by Gerrit Code Review
parent 2c1243b97e f3ab009fd3
commit 0c35e8f2f2
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
software/software/software_controller.py
View File

@@ -2490,6 +2490,8 @@ class PatchController(PatchService):
"Use --force option to execute deploy precheck script.\n"
return dict(info=msg_info, warning=msg_warning, error=msg_error, system_healthy=True)
deploy_in_progress = self._get_software_upgrade()
# parse local config file to pass parameters to precheck script
try:
cp = configparser.ConfigParser()
@@ -2531,7 +2533,8 @@ class PatchController(PatchService):
"--user_domain_name=%s" % user_domain_name,
"--project_domain_name=%s" % project_domain_name,
"--region_name=%s" % region_name,
"--releases=%s" % json.dumps(releases)]
"--releases=%s" % json.dumps(releases),
"--deploy_in_progress=%s" % json.dumps(deploy_in_progress)]
if force:
cmd.append("--force")
if patch: