openstack/puppet-vswitch
Code Issues Proposed changes

Fix missing restart trigger for dpdk options

Browse Source 
The ovs daemon should be restarted when some dpdk options are updated.
This change fixes the missing trigger for restart.

Closes-Bug: #2003158
Change-Id: Id7371e06d8faa09820cd16e1f34c5ed5824b7a11
This commit is contained in:
Takashi Kajinami 2023-01-18 14:21:00 +09:00
parent 59f4da0c71
commit e0d86a8f57
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/dpdk.pp
View File

@ -141,11 +141,11 @@ class vswitch::dpdk (
}
$dpdk_configs = {
'other_config:dpdk-extra' => { value => $memory_channels_conf},
'other_config:dpdk-socket-mem' => { value => join(any2array($socket_mem), ',')},
'other_config:dpdk-socket-limit' => { value => join(any2array($socket_limit), ',')},
'other_config:dpdk-lcore-mask' => { value => $dpdk_lcore_mask},
'other_config:pmd-cpu-mask' => { value => $pmd_core_mask},
'other_config:dpdk-extra' => { value => $memory_channels_conf, restart => true },
'other_config:dpdk-socket-mem' => { value => join(any2array($socket_mem), ','), restart => true},
'other_config:dpdk-socket-limit' => { value => join(any2array($socket_limit), ','), restart => true},
'other_config:dpdk-lcore-mask' => { value => $dpdk_lcore_mask, restart => true},
'other_config:pmd-cpu-mask' => { value => $pmd_core_mask, restart => true},
'other_config:n-revalidator-threads' => { value => $revalidator_cores},
'other_config:n-handler-threads' => { value => $handler_cores},
}
@ -264,8 +264,9 @@ class vswitch::dpdk (
}
vs_config { 'other_config:dpdk-init':
value => true,
wait => true,
value => true,
restart => true,
wait => true,
}
service { 'openvswitch':

5
releasenotes/notes/bug-2003158-2706cb89f5a86b9f.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixed missing triggers to restart the ovs daemon when dpdk options are
updated.

22
spec/classes/vswitch_dpdk_spec.rb
View File

@ -33,22 +33,22 @@ describe 'vswitch::dpdk' do
end
it 'configures dpdk options' do
is_expected.to contain_vs_config('other_config:dpdk-init').with(
:value => true, :wait => true,
:value => true, :wait => true, :restart => true,
)
is_expected.to contain_vs_config('other_config:pmd-cpu-mask').with(
:value => nil, :wait => false,
:value => nil, :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:dpdk-socket-mem').with(
:value => '', :wait => false,
:value => '', :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:dpdk-socket-limit').with(
:value => '', :wait => false,
:value => '', :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:dpdk-lcore-mask').with(
:value => nil, :wait => false,
:value => nil, :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:dpdk-extra').with(
:value => nil, :wait => false,
:value => nil, :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:hw-offload').with(
:ensure => 'absent', :restart => true, :wait => true,
@ -108,22 +108,22 @@ describe 'vswitch::dpdk' do
end
it 'configures dpdk options' do
is_expected.to contain_vs_config('other_config:dpdk-init').with(
:value => true, :wait => true,
:value => true, :wait => true, :restart => true,
)
is_expected.to contain_vs_config('other_config:pmd-cpu-mask').with(
:value => '3c0000000003c00000', :wait => false,
)
is_expected.to contain_vs_config('other_config:dpdk-socket-mem').with(
:value => '1024,1024', :wait => false,
:value => '1024,1024', :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:dpdk-socket-limit').with(
:value => '2048,2048', :wait => false,
:value => '2048,2048', :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:dpdk-lcore-mask').with(
:value => '6', :wait => false,
:value => '6', :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:dpdk-extra').with(
:value => '-n 2', :wait => false,
:value => '-n 2', :wait => false, :restart => true,
)
is_expected.to contain_vs_config('other_config:hw-offload').with(
:value => true, :restart => true, :wait => true,