Merge "Ensurability fix for modular/netconfig/netconfig.pp"
This commit is contained in:
commit
63a44659db
@ -56,6 +56,11 @@ if hiera('set_rps', true) {
|
||||
value => cpu_affinity_hex($::processorcount),
|
||||
sysfs => '/sys/class/net/*/queues/rx-*/rps_cpus',
|
||||
exclude => '/sys/class/net/lo/*',
|
||||
}
|
||||
} else {
|
||||
sysfs_config_value { 'rps_cpus' :
|
||||
ensure => 'absent',
|
||||
name => '/etc/sysfs.d/rps_cpus.conf',
|
||||
}
|
||||
}
|
||||
|
||||
@ -67,6 +72,11 @@ if hiera('set_xps', true) {
|
||||
sysfs => '/sys/class/net/*/queues/tx-*/xps_cpus',
|
||||
exclude => '/sys/class/net/lo/*',
|
||||
}
|
||||
} else {
|
||||
sysfs_config_value { 'xps_cpus' :
|
||||
ensure => 'absent',
|
||||
name => '/etc/sysfs.d/xps_cpus.conf',
|
||||
}
|
||||
}
|
||||
|
||||
if !defined(Package['irqbalance']) {
|
||||
|
@ -38,6 +38,11 @@ describe manifest do
|
||||
'exclude' => '/sys/class/net/lo/*',
|
||||
|
||||
)}
|
||||
else
|
||||
it { should contain_sysfs_config_value('rps_cpus').with(
|
||||
'ensure' => 'absent',
|
||||
'name' => '/etc/sysfs.d/rps_cpus.conf',
|
||||
)}
|
||||
end
|
||||
if set_xps
|
||||
it { should contain_sysfs_config_value('xps_cpus').with(
|
||||
@ -46,6 +51,11 @@ describe manifest do
|
||||
'sysfs' => '/sys/class/net/*/queues/tx-*/xps_cpus',
|
||||
'exclude' => '/sys/class/net/lo/*',
|
||||
)}
|
||||
else
|
||||
it { should contain_sysfs_config_value('xps_cpus').with(
|
||||
'ensure' => 'absent',
|
||||
'name' => '/etc/sysfs.d/xps_cpus.conf',
|
||||
)}
|
||||
end
|
||||
if enable_dpdk
|
||||
it 'should set dpdk-specific options for OVS' do
|
||||
|
Loading…
Reference in New Issue
Block a user