From f8c508ca062308d298aba276419086d0f9e092d7 Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Thu, 25 Jun 2020 14:15:30 -0400
Subject: [PATCH] Resize /scratch to 16G in controller kickstarts

Update controller kickstarts to create /scratch as a 16G volume on
installation.

Change-Id: I68a0a67642887373924eea13a1074db753185734
Partial-Bug: 1885168
Signed-off-by: Don Penney <don.penney@windriver.com>
---
 bsp-files/kickstarts/pre_disk_aio.cfg        | 24 ++++++++++----------
 bsp-files/kickstarts/pre_disk_controller.cfg |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bsp-files/kickstarts/pre_disk_aio.cfg b/bsp-files/kickstarts/pre_disk_aio.cfg
index ef304eb1..5832ac50 100755
--- a/bsp-files/kickstarts/pre_disk_aio.cfg
+++ b/bsp-files/kickstarts/pre_disk_aio.cfg
@@ -20,7 +20,7 @@
 ## BACKUP = DEFAULT_DATABASE_STOR_SIZE + DEFAULT_IMAGE_STOR_SIZE
 ##                                     + BACKUP_OVERHEAD = 40
 ## LOG_VOL_SIZE = 8192
-## SCRATCH_VOL_SIZE = 8192
+## SCRATCH_VOL_SIZE = 16384
 ## RABBIT = 2048
 ## PLATFORM = 2048
 ## ANCHOR = 1024
@@ -33,9 +33,9 @@
 ## KUBELET_VOL_SIZE = 10240
 ## RESERVED_PE = 16 (based on pesize=32768)
 ##
-## CGCS_PV_SIZE = 10240 + 2*20480 + 20480 + 40960 + 8196 + 8196 + 2048 +
+## CGCS_PV_SIZE = 10240 + 2*20480 + 20480 + 40960 + 8192 + 16384 + 2048 +
 ##                2048 + 1024 + 1024 + 5120 + 30720 + 16384 + 5120 +
-##                20480 + 10240 + 16 = 223256
+##                20480 + 10240 + 16 = 231440
 ##
 ## small install - (for disks below 240GB)
 ##  - DB size is doubled to allow for upgrades
@@ -46,7 +46,7 @@
 ## DEFAULT_SMALL_BACKUP_STOR_SIZE = 30
 ##
 ## LOG_VOL_SIZE = 8192
-## SCRATCH_VOL_SIZE = 8192
+## SCRATCH_VOL_SIZE = 16384
 ## RABBIT = 2048
 ## PLATFORM = 2048
 ## ANCHOR = 1024
@@ -60,9 +60,9 @@
 ## RESERVED_PE = 16 (based on pesize=32768)
 ##
 ##
-## CGCS_PV_SIZE = 10240 + 2*10240 + 10240 + 30720 + 8192 + 8192 + 2048 +
+## CGCS_PV_SIZE = 10240 + 2*10240 + 10240 + 30720 + 8192 + 16384 + 2048 +
 ##                2048 + 1024 + 1024 + 5120 + 30720 + 16384 + 5120 +
-##                20480 + 10240 + 16 = 182288
+##                20480 + 10240 + 16 = 190480
 ##
 ## NOTE: To maintain upgrade compatability within the volume group, keep the
 ## undersized LOG_VOL_SIZE and SCRATCH_VOL_SIZE, but size the minimally size
@@ -88,19 +88,19 @@
 sz=$(blockdev --getsize64 $(get_disk $ROOTFS_DISK))
 if [ $sz -le $((240*$gb)) ] ; then
     # Round CGCS_PV_SIZE to the closest upper value that can be divided by 1024.
-    # 182288/1024=178.01. CGCS_PV_SIZE=179*1024=183296. Using a disk with a
-    # size under 179GiB will fail.
-    CGCS_PV_SIZE=183296
+    # 190480/1024=186.02. CGCS_PV_SIZE=187*1024=191488. Using a disk with a
+    # size under 187GiB will fail.
+    CGCS_PV_SIZE=191488
 
 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
+    # 231440/1024=226.02. CGCS_PV_SIZE=227*1024=232448.
+    CGCS_PV_SIZE=232448
 fi
 
 ROOTFS_SIZE=20000
 LOG_VOL_SIZE=8000
-SCRATCH_VOL_SIZE=8000
+SCRATCH_VOL_SIZE=16000
 PLATFORM_BACKUP_SIZE=10000
 BOOT_SIZE=500
 EFI_SIZE=300
diff --git a/bsp-files/kickstarts/pre_disk_controller.cfg b/bsp-files/kickstarts/pre_disk_controller.cfg
index 6399b782..7ab8e7ed 100755
--- a/bsp-files/kickstarts/pre_disk_controller.cfg
+++ b/bsp-files/kickstarts/pre_disk_controller.cfg
@@ -4,7 +4,7 @@
 
 ROOTFS_SIZE=20000
 LOG_VOL_SIZE=8000
-SCRATCH_VOL_SIZE=8000
+SCRATCH_VOL_SIZE=16000
 PLATFORM_BACKUP_SIZE=10000
 BOOT_SIZE=500
 EFI_SIZE=300