From 2ddb029f730e22adc7bf825d3088747e517a3585 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 25 Jun 2020 14:17:44 -0400 Subject: [PATCH] Remove hardcoded /scratch size from manifest This update removes the hardcoded sizing of /scratch on controllers from the filesystem manifest, and instead using the configured lv_size from sysinv. Currently, on a reinstall of the controller, the configured size would be ignored, and /scratch would be resized to the hardcoded 16G value. Instead, the initial sizing is updated to 16G in the controller kickstarts, sizing /scratch to the desired default size on installation. If the filesystem has been resized in sysinv configuration to a higher value, then the filesystem manifest will now resize accordingly on a reinstall. Depends-On: https://review.opendev.org/738084 Change-Id: Id0f7072d555018f8b19b91fd291ac3b008c10173 Closes-Bug: 1885168 Signed-off-by: Don Penney --- puppet-manifests/centos/build_srpm.data | 2 +- .../src/modules/platform/manifests/filesystem.pp | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index b6529b7ab..b5a772142 100644 --- a/puppet-manifests/centos/build_srpm.data +++ b/puppet-manifests/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="src" -TIS_PATCH_VER=102 +TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/puppet-manifests/src/modules/platform/manifests/filesystem.pp b/puppet-manifests/src/modules/platform/manifests/filesystem.pp index 77ef92a5b..5194ebfe8 100644 --- a/puppet-manifests/src/modules/platform/manifests/filesystem.pp +++ b/puppet-manifests/src/modules/platform/manifests/filesystem.pp @@ -190,15 +190,9 @@ class platform::filesystem::scratch::params ( class platform::filesystem::scratch inherits ::platform::filesystem::scratch::params { - if $::personality == 'controller' { - $default_lv_size = '16' - } else { - $default_lv_size = $lv_size - } - platform::filesystem { $lv_name: lv_name => $lv_name, - lv_size => $default_lv_size, + lv_size => $lv_size, mountpoint => $mountpoint, fs_type => $fs_type, fs_options => $fs_options,