From c8cc7064ff2a15af92786f25cb1f2ec50772d056 Mon Sep 17 00:00:00 2001 From: David Sullivan Date: Tue, 19 Oct 2021 09:16:52 -0500 Subject: [PATCH] Update platform-backup to use 30GB partition In order to support local installation, the platform-backup partition needs to be large enough to support the install files. The new recommended size is 30GB based on the following criteria: ISO image (2.5GB) 5 patches (2.5GB) - 500M per patch Compressed image archive (5G) - archive is currently 14G uncompressed Platform Backup (10G) - current size This change also includes an option to pass the partition size in the boot parameters. Test Plan: AIO install with 240GB disk AIO install with 500GB disk AIO install with custom partition size AIO install with smaller custom partition size Standard install AIO-DX upgrade from 21.05 Story: 2008966 Task: 43981 Depends-On: https://review.opendev.org/c/starlingx/config/+/817967 Signed-off-by: David Sullivan Change-Id: Ie8c6def2382dad38371dd280fa304ebbc839b675 --- bsp-files/kickstarts/pre_disk_aio.cfg | 3 ++- bsp-files/kickstarts/pre_disk_controller.cfg | 3 ++- bsp-files/kickstarts/pre_disk_setup_common.cfg | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bsp-files/kickstarts/pre_disk_aio.cfg b/bsp-files/kickstarts/pre_disk_aio.cfg index 09d831dc..a45cdff7 100755 --- a/bsp-files/kickstarts/pre_disk_aio.cfg +++ b/bsp-files/kickstarts/pre_disk_aio.cfg @@ -82,10 +82,11 @@ ROOTFS_SIZE=20000 LOG_VOL_SIZE=8000 SCRATCH_VOL_SIZE=16000 -PLATFORM_BACKUP_SIZE=10000 BOOT_SIZE=500 EFI_SIZE=300 +PLATFORM_BACKUP_SIZE=$persistent_size + # The default disk size thresholds must align with the ones in # config/.../sysinv/common/constants.py # which are DEFAULT_SMALL_DISK_SIZE diff --git a/bsp-files/kickstarts/pre_disk_controller.cfg b/bsp-files/kickstarts/pre_disk_controller.cfg index 1d246027..a2a9fb46 100755 --- a/bsp-files/kickstarts/pre_disk_controller.cfg +++ b/bsp-files/kickstarts/pre_disk_controller.cfg @@ -5,10 +5,11 @@ ROOTFS_SIZE=20000 LOG_VOL_SIZE=8000 SCRATCH_VOL_SIZE=16000 -PLATFORM_BACKUP_SIZE=10000 BOOT_SIZE=500 EFI_SIZE=300 +PLATFORM_BACKUP_SIZE=$persistent_size + ROOTFS_OPTIONS="defaults" profile_mode=`cat /proc/cmdline |xargs -n1 echo |grep security_profile= | grep extended` if [ -n "$profile_mode" ]; then diff --git a/bsp-files/kickstarts/pre_disk_setup_common.cfg b/bsp-files/kickstarts/pre_disk_setup_common.cfg index 07b0304f..b5e48081 100644 --- a/bsp-files/kickstarts/pre_disk_setup_common.cfg +++ b/bsp-files/kickstarts/pre_disk_setup_common.cfg @@ -22,6 +22,10 @@ fi if [ -z "$rootfs_device" ]; then rootfs_device=$(get_disk_dev) fi +if [ -z "$persistent_size" ]; then + # Default backup partition size in MiB + persistent_size=30000 +fi # Get root and boot devices orig_rootfs_device=$rootfs_device