starlingx
/
gui
Code Issues Proposed changes

Merge "Update Controller Filesystem"

This commit is contained in:
Zuul 2019-07-10 13:12:25 +00:00 committed by Gerrit Code Review
parent a29348754a 87e7db406f
commit a3061b5da5
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/sysinv.py
View File

@ -1631,15 +1631,13 @@ class CephMon(base.APIResourceWrapper):
class STORAGE(base.APIResourceWrapper):
"""..."""
_attrs = ['isystem_uuid', 'backup_gib', 'scratch_gib', 'cgcs_gib',
_attrs = ['isystem_uuid', 'cgcs_gib',
'img_conversions_gib', 'database_gib', 'uuid', 'link']
def __init__(self, controller_fs, ceph_mon):
if controller_fs:
super(STORAGE, self).__init__(controller_fs)
self._backup_gib = None
self._scratch_gib = None
self._cgcs_gib = None
self._img_conversions_gib = None
self._database_gib = None
@ -1647,8 +1645,6 @@ class STORAGE(base.APIResourceWrapper):
if hasattr(self, 'uuid'):
if controller_fs:
self._backup_gib = controller_fs.backup_gib
self._scratch_gib = controller_fs.scratch_gib
self._cgcs_gib = controller_fs.cgcs_gib
self._img_conversions_gib = controller_fs.img_conversions_gib
self._database_gib = controller_fs.database_gib
@ -1658,14 +1654,6 @@ class STORAGE(base.APIResourceWrapper):
self._ceph_mon_gib = ceph_mon.ceph_mon_gib
self._hostname = ceph_mon.hostname
@property
def backup_gib(self):
return self._backup_gib
@property
def scratch_gib(self):
return self._scratch_gib
@property
def cgcs_gib(self):
return self._cgcs_gib

18
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/system_config/forms.py
View File

@ -689,30 +689,12 @@ class UpdateiStorage(forms.SelfHandlingForm):
help_text=_("Glance image storage space in gibibytes."),
min_value=0)
backup = forms.IntegerField(
label=_("Backup Storage (GiB)"),
required=True,
help_text=_("Backup storage space in gibibytes."),
min_value=0)
scratch = forms.IntegerField(
label=_("Scratch Storage (GiB)"),
required=True,
help_text=_("Platform Scratch storage space in gibibytes."),
min_value=0)
extension = forms.IntegerField(
label=_("Extension Storage (GiB)"),
required=True,
help_text=_("Platform Extension storage space in gibibytes."),
min_value=0)
docker = forms.IntegerField(
label=_("Docker Storage (GiB)"),
required=True,
help_text=_("Docker storage space in gibibytes."),
min_value=0)
etcd = forms.IntegerField(
label=_("Etcd Storage (GiB)"),
required=True,