starlingx
/
stx-puppet
Code Issues Proposed changes

Remove sriov_vfs/reported # of VFs from hieradata 

The original fix of https://bugs.launchpad.net/starlingx/+bug/1931458
made the parameter 'num_vfs' of hieradata to be used solely to retain
the user configuration and added a new parameter 'sriov_vfs' to store
the value of actual number of VFs reported from device by sysinv. It was
done in this way to avoid the report overwriting the user configuration
in race conditions.
However, it was noticed during patch removal procedures that once the
hieradata had this parameter added by later FEC configuration, after the
patch was removed the parser started to claim about the unknown parame-
ter 'sriov_vfs'.
Since that parameter was added just to keep the reported number of VFs
stored in hieradata (like before when used the 'num_vfs' parameter) this
change removes such "debugging" parameter to avoid patch removal issues.

Closes-Bug: #1931458
Signed-off-by: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com>
Change-Id: I5d52163749336ff002b8a2911554b2de13ba6382
This commit is contained in:
Douglas Henrique Koerich 2021-09-13 09:05:10 -03:00
parent d3cf992786
commit 46ba4db595
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet-manifests/src/modules/platform/manifests/devices.pp
View File

@ -44,8 +44,7 @@ define platform::devices::sriov_enable (
$num_vfs,
$addr,
$driver,
$device_id,
$sriov_vfs = undef
$device_id
) {
if ($driver == 'igb_uio') {
$vf_file = 'max_vfs'
@ -63,7 +62,6 @@ define platform::devices::sriov_bind (
$addr,
$driver,
$num_vfs = undef,
$sriov_vfs = undef,
$device_id = undef
) {
if ($driver != undef) and ($addr != undef) {