starlingx
/
gui
Code Issues Proposed changes

Merge "Make parallel option available for AIO patch strategy"

This commit is contained in:
Zuul 2019-10-30 20:40:16 +00:00 committed by Gerrit Code Review
parent d90a06b838 9b028aaa9c
commit 161e69480f
1 changed files with 1 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/admin/software_management/forms.py
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2016 Wind River Systems, Inc. # Copyright (c) 2016-2019 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -74,10 +74,6 @@ class CreatePatchStrategyForm(forms.SelfHandlingForm):
('ignore', _("Ignore")), ('ignore', _("Ignore")),
) )
AIO_APPLY_TYPES = (
('serial', _("Serial")),
)
GENERIC_APPLY_TYPES = ( GENERIC_APPLY_TYPES = (
('serial', _("Serial")), ('serial', _("Serial")),
('parallel', _("Parallel")), ('parallel', _("Parallel")),
@ -156,7 +152,6 @@ class CreatePatchStrategyForm(forms.SelfHandlingForm):
system_type = stx_api.sysinv.get_system_type(request) system_type = stx_api.sysinv.get_system_type(request)
if system_type == stx_api.sysinv.SYSTEM_TYPE_AIO: if system_type == stx_api.sysinv.SYSTEM_TYPE_AIO:
del self.fields['controller_apply_type'] del self.fields['controller_apply_type']
self.fields['worker_apply_type'].choices = self.AIO_APPLY_TYPES
if stx_api.sysinv.is_system_mode_simplex(request): if stx_api.sysinv.is_system_mode_simplex(request):
self.fields['default_instance_action'].choices = \ self.fields['default_instance_action'].choices = \