starlingx/metal
Code Issues Proposed changes

Increase cgts-vg size to accommodate new kubelet fs

Browse Source 
A new filesystem called "kubelet" is being added to all nodes with a
default size of 10G. This commit increases the cgts-vg size to
accommodate new kubelet fs on worker nodes.

Tested with install of hardware Standard and AIO-DX labs. Also
tested install of a vbox AIO-SX lab.

Partial-Bug: 1830142

Change-Id: I124a977e4c7ea9239a2d7cb04d0d42c4093bf4bb
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-07-16 13:20:16 -04:00
parent e0f35b8a8c
commit 3aea82253e
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,15 +26,16 @@
## ANCHOR = 1024 ## ANCHOR = 1024
## EXTENSION = 1024 ## EXTENSION = 1024
## GNOCCHI = 5120 ## GNOCCHI = 5120
## DOCKER = 30720 (--kubernetes) ## DOCKER = 30720
## DOCKER_DIST = 16384 (--kubernetes) ## DOCKER_DIST = 16384
## ETCD = 5120 (--kubernetes) ## ETCD = 5120
## CEPH_MON = 20480 (--kubernetes) ## CEPH_MON = 20480
## KUBELET_VOL_SIZE = 10240
## RESERVED_PE = 16 (based on pesize=32768) ## RESERVED_PE = 16 (based on pesize=32768)
## ##
## CGCS_PV_SIZE = 10240 + 2*20480 + 20480 + 51200 + 8196 + 8196 + 2048 + ## CGCS_PV_SIZE = 10240 + 2*20480 + 20480 + 51200 + 8196 + 8196 + 2048 +
## 2048 + 1024 + 1024 + 5120 + 30720 + 16384 + 5120 + ## 2048 + 1024 + 1024 + 5120 + 30720 + 16384 + 5120 +
## 20480 + 16 = 223256 ## 20480 + 10240 + 16 = 233496
## ##
## small install - (for disks below 240GB) ## small install - (for disks below 240GB)
## - DB size is doubled to allow for upgrades ## - DB size is doubled to allow for upgrades
@ -51,16 +52,17 @@
## ANCHOR = 1024 ## ANCHOR = 1024
## EXTENSION = 1024 ## EXTENSION = 1024
## GNOCCHI = 5120 ## GNOCCHI = 5120
## DOCKER = 30720 (--kubernetes) ## DOCKER = 30720
## DOCKER_DIST = 16384 (--kubernetes) ## DOCKER_DIST = 16384
## ETCD = 5120 (--kubernetes) ## ETCD = 5120
## CEPH_MON = 20480 (--kubernetes) ## CEPH_MON = 20480
## KUBELET_VOL_SIZE = 10240
## RESERVED_PE = 16 (based on pesize=32768) ## RESERVED_PE = 16 (based on pesize=32768)
## ##
## ##
## CGCS_PV_SIZE = 10240 + 2*10240 + 10240 + 40960 + 8192 + 8192 + 2048 + ## CGCS_PV_SIZE = 10240 + 2*10240 + 10240 + 40960 + 8192 + 8192 + 2048 +
## 2048 + 1024 + 1024 + 5120 + 30720 + 16384 + 5120 + ## 2048 + 1024 + 1024 + 5120 + 30720 + 16384 + 5120 +
## 20480 + 16 = 182288 ## 20480 + 10240 + 16 = 192528
## ##
## NOTE: To maintain upgrade compatability within the volume group, keep the ## NOTE: To maintain upgrade compatability within the volume group, keep the
## undersized LOG_VOL_SIZE and SCRATCH_VOL_SIZE, but size the minimally size ## undersized LOG_VOL_SIZE and SCRATCH_VOL_SIZE, but size the minimally size
@ -86,13 +88,13 @@
sz=$(blockdev --getsize64 $(get_disk $rootfs_device)) sz=$(blockdev --getsize64 $(get_disk $rootfs_device))
if [ $sz -le $((240*$gb)) ] ; then if [ $sz -le $((240*$gb)) ] ; then
# 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.
# 182288/1024=178.02. CGCS_PV_SIZE=179*1024=183296. Using a disk with a # 192528/1024=188.01. CGCS_PV_SIZE=189*1024=193536. Using a disk with a
# size under 179GiB will fail. # size under 189GiB will fail.
CGCS_PV_SIZE=183296 CGCS_PV_SIZE=193536
else else
# 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.
# 223256/1024=218.02. CGCS_PV_SIZE=219*1024=224256. # 233496/1024=228.02. CGCS_PV_SIZE=229*1024=234496.
CGCS_PV_SIZE=224256 CGCS_PV_SIZE=234496
fi fi
ROOTFS_SIZE=20000 ROOTFS_SIZE=20000

14
bsp-files/kickstarts/pre_disk_worker.cfg
View File

@ -1,17 +1,19 @@
LOG_VOL_SIZE=4000 LOG_VOL_SIZE=4000
SCRATCH_VOL_SIZE=4000 SCRATCH_VOL_SIZE=4000
BOOT_VOL_SIZE=500
## LOG_VOL_SIZE = 4096 ## LOG_VOL_SIZE = 4096
## SCRATCH_VOL_SIZE = 4096 ## SCRATCH_VOL_SIZE = 4096
## DOCKER = 30720 (--kubernetes) ## DOCKER = 30720
## CEPH_MON = 20480 (--kubernetes) ## CEPH_MON = 20480
## KUBELET_VOL_SIZE = 10240
## RESERVED_PE = 16 (based on pesize=32768) ## RESERVED_PE = 16 (based on pesize=32768)
## ##
## CGTS_PV_SIZE = 4096 + 4096 + 30720 + 20480 + 16 = 59408 ## CGTS_PV_SIZE = 4096 + 4096 + 30720 + 20480 + 10240 + 16 = 69648
## ##
## Round CGTS_PV_SIZE to the closest upper value that can be divided by 1024. ## Round CGTS_PV_SIZE to the closest upper value that can be divided by 1024.
## 59408/1024=58.01. CGTS_PV_SIZE=59*1024=60416. ## 69648/1024=68.01. CGTS_PV_SIZE=69*1024=70656.
CGTS_PV_SIZE=60416 CGTS_PV_SIZE=70656
sz=$(blockdev --getsize64 $(get_disk $rootfs_device)) sz=$(blockdev --getsize64 $(get_disk $rootfs_device))
if [ $sz -le $((80*$gb)) ] ; then if [ $sz -le $((80*$gb)) ] ; then
@ -30,7 +32,7 @@ if [ -n "$profile_mode" ]; then
fi fi
cat<<EOF>>/tmp/part-include cat<<EOF>>/tmp/part-include
part /boot --fstype=ext4 --asprimary --size=500 --ondrive=$(get_disk $rootfs_device) --fsoptions="$ROOTFS_OPTIONS" part /boot --fstype=ext4 --asprimary --size=$BOOT_VOL_SIZE --ondrive=$(get_disk $rootfs_device) --fsoptions="$ROOTFS_OPTIONS"
part pv.253004 --asprimary --size=$CGTS_PV_SIZE --ondrive=$(get_disk $rootfs_device) part pv.253004 --asprimary --size=$CGTS_PV_SIZE --ondrive=$(get_disk $rootfs_device)
volgroup cgts-vg --pesize=32768 pv.253004 volgroup cgts-vg --pesize=32768 pv.253004
logvol /var/log --fstype=ext4 --vgname=cgts-vg --size=$LOG_VOL_SIZE --name=log-lv logvol /var/log --fstype=ext4 --vgname=cgts-vg --size=$LOG_VOL_SIZE --name=log-lv