starlingx
/
metal
Code Issues Proposed changes

Correct the preserved cgts-vg size in AIO kickstart 

Filesystems gnocchi and anchor were obsolete. Remove them
from the calculation of the minimum cgts-vg size. Correct
some other filesystem sizes like backup and pgsql.

We should preserve the PV size that fits the minimum
requirement to allow users to partition as they need.

Tested on both hardware labs and vbox.

Change-Id: I80d0765e3c6719e71a0647cab15630077ab42067
Partial-Bug: 1892554
Signed-off-by: Angie Wang <angie.wang@windriver.com>
This commit is contained in:
Angie Wang 2020-08-21 18:39:42 -04:00
parent 13a6248586
commit c7e18ca9e9
1 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bsp-files/kickstarts/pre_disk_aio.cfg
View File

@ -15,52 +15,44 @@
## - DB size is doubled to allow for upgrades ## - DB size is doubled to allow for upgrades
## ##
## BACKUP_OVERHEAD = 5GiB ## BACKUP_OVERHEAD = 5GiB
## DEFAULT_IMAGE_STOR_SIZE = 10GiB ## DEFAULT_PLATFORM_STOR_SIZE = 10GiB
## DEFAULT_DATABASE_STOR_SIZE = 20GiB ## DEFAULT_DATABASE_STOR_SIZE = 10GiB
## DEFAULT_IMG_CONVERSION_STOR_SIZE = 20GiB ## BACKUP = DEFAULT_DATABASE_STOR_SIZE +
## BACKUP = DEFAULT_DATABASE_STOR_SIZE + DEFAULT_IMAGE_STOR_SIZE ## DEFAULT_PLATFORM_STOR_SIZE +
## + BACKUP_OVERHEAD = 40GiB ## BACKUP_OVERHEAD = 25GiB
## LOG_VOL_SIZE = 8GiB ## LOG_VOL_SIZE = 8GiB
## SCRATCH_VOL_SIZE = 16GiB ## SCRATCH_VOL_SIZE = 16GiB
## RABBIT = 2GiB ## RABBIT_LV = 2GiB
## PLATFORM = 2GiB ## DEFAULT_EXTENSION_STOR_SIZE = 1GiB
## ANCHOR = 1GiB ## KUBERNETES_DOCKER_STOR_SIZE = 30GiB
## EXTENSION = 1GiB ## DOCKER_DISTRIBUTION_STOR_SIZE = 16GiB
## GNOCCHI = 5GiB ## ETCD_STOR_SIZE = 5GiB
## DOCKER = 30GiB ## CEPH_MON_SIZE = 20GiB
## DOCKER_DIST = 16GiB ## KUBELET_STOR_SIZE = 10GiB
## ETCD = 5GiB
## CEPH_MON = 20GiB
## KUBELET_VOL_SIZE = 10GiB
## RESERVED_PE = 16MiB (based on pesize=32768) ## RESERVED_PE = 16MiB (based on pesize=32768)
## ##
## CGCS_PV_SIZE = (10 + 2*20 + 20 + 40 + 8 + 16 + 2 + 2 + 1 + 1 + 5 + 30 + 16 + 5 + 20 + 10)GiB + 16MiB/1024 = 226.02GiB ## CGCS_PV_SIZE = (10 + 2*10 + 25 + 8 + 16 + 2 + 1 + 30 + 16 + 5 + 20 + 10)GiB + 16MiB/1024 = 163.02GiB
## ##
##*************************************************************************************************** ##***************************************************************************************************
## Small disk install - (for disks below 240GB) ## Small disk install - (for disks below 240GB)
## - DB size is doubled to allow for upgrades ## - DB size is doubled to allow for upgrades
## ##
## DEFAULT_SMALL_IMAGE_STOR_SIZE = 10GiB ## DEFAULT_PLATFORM_STOR_SIZE = 10GiB
## DEFAULT_SMALL_DATABASE_STOR_SIZE = 10GiB ## DEFAULT_SMALL_DATABASE_STOR_SIZE = 5GiB
## DEFAULT_SMALL_IMG_CONVERSION_STOR_SIZE = 10GiB ## DEFAULT_SMALL_BACKUP_STOR_SIZE = 20GiB
## DEFAULT_SMALL_BACKUP_STOR_SIZE = 30GiB
## ##
## LOG_VOL_SIZE = 8GiB ## LOG_VOL_SIZE = 8GiB
## SCRATCH_VOL_SIZE = 16GiB ## SCRATCH_VOL_SIZE = 16GiB
## RABBIT = 2GiB ## RABBIT_LV = 2GiB
## PLATFORM = 2GiB ## DEFAULT_EXTENSION_STOR_SIZE = 1GiB
## ANCHOR = 1GiB ## KUBERNETES_DOCKER_STOR_SIZE = 30GiB
## EXTENSION = 1GiB ## DOCKER_DISTRIBUTION_STOR_SIZE = 16GiB
## GNOCCHI = 5GiB ## ETCD_STOR_SIZE = 5GiB
## DOCKER = 30GiB ## CEPH_MON_SIZE = 20GiB
## DOCKER_DIST = 16GiB ## KUBELET_STOR_SIZE = 10GiB
## ETCD = 5GiB
## CEPH_MON = 20GiB
## KUBELET_VOL_SIZE = 10GiB
## RESERVED_PE = 16MiB (based on pesize=32768) ## RESERVED_PE = 16MiB (based on pesize=32768)
## ##
## ## CGCS_PV_SIZE = (10 + 2*5 + 20 + 8 + 16 + 2 + 1 + 30 + 16 + 5 + 20 + 10)GiB + 16MiB/1024 = 148.02GiB
## CGCS_PV_SIZE = (10 + 2*10 + 10 + 30 + 8 + 16 + 2 + 2 + 1 + 1 + 5 + 30 + 16 + 5 + 20 + 10)GiB + 16MiB/1024 = 186.02GiB
## ##
##*************************************************************************************************** ##***************************************************************************************************
## Tiny disk install - (for disks below 154GB) ## Tiny disk install - (for disks below 154GB)
@ -97,15 +89,15 @@ EFI_SIZE=300
# which are DEFAULT_SMALL_DISK_SIZE # which are DEFAULT_SMALL_DISK_SIZE
# MINIMUM_SMALL_DISK_SIZE # MINIMUM_SMALL_DISK_SIZE
default_small_disk_size=240 default_small_disk_size=240
minimum_small_disk_size=154 minimum_small_disk_size=181
sz=$(blockdev --getsize64 $rootfs_device) sz=$(blockdev --getsize64 $rootfs_device)
# Round CGCS_PV_SIZE to the closest upper value that can be divided by 1024. # Round CGCS_PV_SIZE to the closest upper value that can be divided by 1024.
if [ $sz -gt $(($default_small_disk_size*$gb)) ] ; then if [ $sz -gt $(($default_small_disk_size*$gb)) ] ; then
# Large disk: CGCS_PV_SIZE=227GiB*1024=232448 # Large disk: CGCS_PV_SIZE=164GiB*1024=167936
CGCS_PV_SIZE=232448 CGCS_PV_SIZE=167936
elif [ $sz -ge $(($minimum_small_disk_size*$gb)) ] ; then elif [ $sz -ge $(($minimum_small_disk_size*$gb)) ] ; then
# Small disk: CGCS_PV_SIZE=187GiB*1024=191488 # Small disk: CGCS_PV_SIZE=149GiB*1024=152576
CGCS_PV_SIZE=191488 CGCS_PV_SIZE=152576
else else
# Tiny disk: CGCS_PV_SIZE=43GiB*1024=44032 # Tiny disk: CGCS_PV_SIZE=43GiB*1024=44032
# Using a disk with a size under 60GiB will fail. # Using a disk with a size under 60GiB will fail.