starlingx/stx-puppet
Code Issues Proposed changes

Remove hardcoded /scratch size from manifest

Browse Source 
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 <don.penney@windriver.com>
This commit is contained in:
Don Penney 2020-06-25 14:17:44 -04:00
parent c51d0e5c3e
commit 2ddb029f73
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="src"
TIS_PATCH_VER=102
TIS_PATCH_VER=PKG_GITREVCOUNT

8
puppet-manifests/src/modules/platform/manifests/filesystem.pp
View File

@ -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,