starlingx
/
gui
Code Issues Proposed changes

Merge "Revert "Add the upload-only option to the Horizon upgrade orchestration UI""

This commit is contained in:
Zuul 2024-02-06 18:35:49 +00:00 committed by Gerrit Code Review
parent 3368e8241f 3dc04f2f69
commit 95e690315e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/forms.py
View File

@ -204,13 +204,12 @@ class CreateCloudStrategyForm(forms.SelfHandlingForm):
label=_("Upload Only"),
initial=False,
required=False,
help_text=_('Stops strategy after uploading releases to subclouds'),
help_text=_('Stops strategy after uploading patches to subclouds'),
widget=forms.CheckboxInput(
attrs={
'class': 'switched',
'data-switch-on': 'strategy_types',
'data-strategy_types-patch': _("Upload Only"),
'data-strategy_types-upgrade': _("Upload Only")
'data-strategy_types-patch': _("Upload Only")
}
)
)
@ -322,7 +321,7 @@ class CreateCloudStrategyForm(forms.SelfHandlingForm):
del data['to-version']
del data['force-kubernetes']
if data['type'] == 'patch' or data['type'] == 'upgrade':
if data['type'] == 'patch':
data['upload-only'] = str(data['upload-only']).lower()
else:
del data['upload-only']

3
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_orchestration/templates/dc_orchestration/_cloud_strategy_orchestration.html
View File

@ -18,8 +18,7 @@
<dt>{% trans "Stop On Failure" %}</dt>
<dd>{{ strategy.stop_on_failure }}</dd>
{% if strategy.extra_args %}
<!--TODO(cdeolive): remove patch strategy when usm is fully integrated.-->
{% if strategy.strategy_type == 'patch' or strategy.strategy_type == 'upgrade' %}
{% if strategy.strategy_type == 'patch' %}
<dt>{% trans "Upload Only" %}</dt>
<dd>{{ strategy.extra_args|get_value:"upload-only" }}</dd>
{% elif strategy.strategy_type == 'prestage' %}