starlingx
/
config
Code Issues Proposed changes

Merge "Improve robustness of helm-override-update"

This commit is contained in:
Zuul 2019-01-29 20:27:27 +00:00 committed by Gerrit Code Review
parent 8ab46b0626 d996947d25
commit 3f6e511ec3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/helm_charts.py
View File

@ -120,13 +120,22 @@ class HelmChartsController(rest.RestController):
raise
if flag == 'reuse':
file_overrides.insert(0, db_chart.user_overrides)
if db_chart.user_overrides is not None:
file_overrides.insert(0, db_chart.user_overrides)
elif flag == 'reset':
pass
else:
raise wsme.exc.ClientSideError(_("Invalid flag: %s must be either "
"'reuse' or 'reset'.") % flag)
if set_overrides:
for overrides in set_overrides:
if ',' in overrides:
raise wsme.exc.ClientSideError(
_("Invalid input: One (or more) set overrides contains "
"multiple values. Consider using --values option "
"instead."))
user_overrides = pecan.request.rpcapi.merge_overrides(
pecan.request.context, file_overrides=file_overrides,
set_overrides=set_overrides)