starlingx
/
config
Code Issues Proposed changes

Update puppet vswitch service dependency on hugepage mount 

The existing dependency for ensuring the hugepage directory was mounted
did not ensure that it was executed before the openvswitch service was
started.  This causes an ordering problem under some configurations
since the OVS DPDK EAL init will fail since it cannot map the hugepages.

This update ensures the dependency is defined against the service rather
than the generic platform::vswitch puppet class to correct the
incomplete dependency ordering.

Story: 2003104
Task: 24862

Change-Id: I2dc9479024bd8363503058c0a9d3034b7c662a07
Signed-off-by: Matt Peters <matt.peters@windriver.com>
This commit is contained in:
Matt Peters 2018-08-10 09:30:27 -05:00
parent 2749d9a693
commit b03820df16
2 changed files with 3 additions and 2 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=61
TIS_PATCH_VER=62

3
puppet-manifests/src/modules/platform/manifests/vswitch.pp
View File

@ -10,7 +10,6 @@ class platform::vswitch
inherits ::platform::vswitch::params {
Class[$name] -> Class['::platform::network']
Mount[$hugepage_dir] -> Class[$name]
$enable_unsafe_noiommu_mode = bool2num(!$iommu_enabled)
@ -91,6 +90,8 @@ class platform::vswitch::ovs(
before => Service['openvswitch']
})
Mount[$hugepage_dir] -> Service['openvswitch']
$dpdk_configs = {
'other_config:dpdk-hugepage-dir' => { value => $hugepage_dir },
}