From b03820df16ab91ca56ec2061bad6a6efc58d712c Mon Sep 17 00:00:00 2001 From: Matt Peters Date: Fri, 10 Aug 2018 09:30:27 -0500 Subject: [PATCH] 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 --- puppet-manifests/centos/build_srpm.data | 2 +- puppet-manifests/src/modules/platform/manifests/vswitch.pp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index 1d2aa198bd..65999a7567 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=61 +TIS_PATCH_VER=62 diff --git a/puppet-manifests/src/modules/platform/manifests/vswitch.pp b/puppet-manifests/src/modules/platform/manifests/vswitch.pp index 0ec1ae44cf..1ec5e08000 100644 --- a/puppet-manifests/src/modules/platform/manifests/vswitch.pp +++ b/puppet-manifests/src/modules/platform/manifests/vswitch.pp @@ -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 }, }