diff --git a/bsp-files/kickstarts/pre_disk_aio.cfg b/bsp-files/kickstarts/pre_disk_aio.cfg index 5b9b8ab0..ca34eadc 100755 --- a/bsp-files/kickstarts/pre_disk_aio.cfg +++ b/bsp-files/kickstarts/pre_disk_aio.cfg @@ -26,15 +26,16 @@ ## ANCHOR = 1024 ## EXTENSION = 1024 ## GNOCCHI = 5120 -## DOCKER = 30720 (--kubernetes) -## DOCKER_DIST = 16384 (--kubernetes) -## ETCD = 5120 (--kubernetes) -## CEPH_MON = 20480 (--kubernetes) +## DOCKER = 30720 +## DOCKER_DIST = 16384 +## ETCD = 5120 +## CEPH_MON = 20480 +## KUBELET_VOL_SIZE = 10240 ## RESERVED_PE = 16 (based on pesize=32768) ## ## CGCS_PV_SIZE = 10240 + 2*20480 + 20480 + 51200 + 8196 + 8196 + 2048 + ## 2048 + 1024 + 1024 + 5120 + 30720 + 16384 + 5120 + -## 20480 + 16 = 223256 +## 20480 + 10240 + 16 = 233496 ## ## small install - (for disks below 240GB) ## - DB size is doubled to allow for upgrades @@ -51,16 +52,17 @@ ## ANCHOR = 1024 ## EXTENSION = 1024 ## GNOCCHI = 5120 -## DOCKER = 30720 (--kubernetes) -## DOCKER_DIST = 16384 (--kubernetes) -## ETCD = 5120 (--kubernetes) -## CEPH_MON = 20480 (--kubernetes) +## DOCKER = 30720 +## DOCKER_DIST = 16384 +## ETCD = 5120 +## CEPH_MON = 20480 +## KUBELET_VOL_SIZE = 10240 ## RESERVED_PE = 16 (based on pesize=32768) ## ## ## CGCS_PV_SIZE = 10240 + 2*10240 + 10240 + 40960 + 8192 + 8192 + 2048 + ## 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 ## undersized LOG_VOL_SIZE and SCRATCH_VOL_SIZE, but size the minimally size @@ -86,13 +88,13 @@ sz=$(blockdev --getsize64 $(get_disk $rootfs_device)) if [ $sz -le $((240*$gb)) ] ; then # 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 - # size under 179GiB will fail. - CGCS_PV_SIZE=183296 + # 192528/1024=188.01. CGCS_PV_SIZE=189*1024=193536. Using a disk with a + # size under 189GiB will fail. + CGCS_PV_SIZE=193536 else # 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. - CGCS_PV_SIZE=224256 + # 233496/1024=228.02. CGCS_PV_SIZE=229*1024=234496. + CGCS_PV_SIZE=234496 fi ROOTFS_SIZE=20000 diff --git a/bsp-files/kickstarts/pre_disk_worker.cfg b/bsp-files/kickstarts/pre_disk_worker.cfg index ebb7cfb4..0edab303 100755 --- a/bsp-files/kickstarts/pre_disk_worker.cfg +++ b/bsp-files/kickstarts/pre_disk_worker.cfg @@ -1,17 +1,19 @@ LOG_VOL_SIZE=4000 SCRATCH_VOL_SIZE=4000 +BOOT_VOL_SIZE=500 ## LOG_VOL_SIZE = 4096 ## SCRATCH_VOL_SIZE = 4096 -## DOCKER = 30720 (--kubernetes) -## CEPH_MON = 20480 (--kubernetes) +## DOCKER = 30720 +## CEPH_MON = 20480 +## KUBELET_VOL_SIZE = 10240 ## 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. -## 59408/1024=58.01. CGTS_PV_SIZE=59*1024=60416. -CGTS_PV_SIZE=60416 +## 69648/1024=68.01. CGTS_PV_SIZE=69*1024=70656. +CGTS_PV_SIZE=70656 sz=$(blockdev --getsize64 $(get_disk $rootfs_device)) if [ $sz -le $((80*$gb)) ] ; then @@ -30,7 +32,7 @@ if [ -n "$profile_mode" ]; then fi cat<>/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) volgroup cgts-vg --pesize=32768 pv.253004 logvol /var/log --fstype=ext4 --vgname=cgts-vg --size=$LOG_VOL_SIZE --name=log-lv