openstack
/
fuel-library
Code Issues Proposed changes

Merge "Ensurability fix for modular/netconfig/netconfig.pp"

This commit is contained in:
Jenkins 2016-03-01 17:11:28 +00:00 committed by Gerrit Code Review
parent a027d3f7f7 3dacd02717
commit 63a44659db
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp
View File

@ -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']) {

10
tests/noop/spec/hosts/netconfig/netconfig_spec.rb
View File

@ -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