openstack
/
puppet-neutron
Code Issues Proposed changes

Ensure resource_provider_bandwitdhs is unset by default 

Currently puppet-neutron supports the resource_provider_bandwidths
parameter for ovs agent and sriov agent, but it doesn't provide the way
to clear existing settings.

This change makes sure that the resource_provider_bandwiths parameter
is unset by default so that operators can reset the parameter to
the default value defined in neutron service itself.

Change-Id: Icd834f4f4ca6578c836935614931af2a3e79bf7d
(cherry picked from commit 5b7bc9f4f9)
(cherry picked from commit ff23708ef4)
This commit is contained in:
Takashi Kajinami 2020-11-16 21:01:19 +09:00
parent 89a24c2001
commit e77d34f037
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/agents/ml2/ovs.pp
View File

@ -318,10 +318,13 @@ class neutron::agents::ml2::ovs (
}
if ($resource_provider_bandwidths != []) {
$res_prov_bw_map_str = join(any2array($resource_provider_bandwidths), ',')
neutron_agent_ovs {
'ovs/resource_provider_bandwidths': value => $res_prov_bw_map_str;
}
$resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')
} else {
$resource_provider_bandwidths_real = $::os_service_default
}
neutron_agent_ovs {
'ovs/resource_provider_bandwidths': value => $resource_provider_bandwidths_real;
}
# TODO(tobias.urdin): Remove in V release.

10
manifests/agents/ml2/sriov.pp
View File

@ -129,10 +129,12 @@ class neutron::agents::ml2::sriov (
}
if ($resource_provider_bandwidths != []) {
$res_prov_bw_map_str = join(any2array($resource_provider_bandwidths), ',')
neutron_sriov_agent_config {
'sriov_nic/resource_provider_bandwidths': value => $res_prov_bw_map_str;
}
$resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')
} else {
$resource_provider_bandwidths_real = $::os_service_default
}
neutron_sriov_agent_config {
'sriov_nic/resource_provider_bandwidths': value => $resource_provider_bandwidths_real;
}
}

3
spec/classes/neutron_agents_ml2_ovs_spec.rb
View File

@ -65,7 +65,8 @@ describe 'neutron::agents::ml2::ovs' do
should contain_neutron_agent_ovs('ovs/tun_peer_patch_port').with_ensure('absent')
should contain_neutron_agent_ovs('agent/tunnel_types').with_ensure('absent')
should contain_neutron_agent_ovs('ovs/igmp_snooping_enable').with_value('<SERVICE DEFAULT>')
should_not contain_neutron_agent_ovs('ovs/resource_provider_bandwidths')
should contain_neutron_agent_ovs('ovs/resource_provider_bandwidths').\
with_value('<SERVICE DEFAULT>')
should contain_neutron_agent_ovs('agent/explicitly_egress_direct').with_value(['<SERVICE DEFAULT>'])
end

3
spec/classes/neutron_agents_ml2_sriov_spec.rb
View File

@ -67,7 +67,8 @@ describe 'neutron::agents::ml2::sriov' do
end
it 'does not configure resource_provider_bandwidths by default' do
should_not contain_neutron_sriov_agent_config('sriov_nic/resource_provider_bandwidths')
should contain_neutron_sriov_agent_config('sriov_nic/resource_provider_bandwidths').\
with_value('<SERVICE DEFAULT>')
end
context 'when number_of_vfs is empty' do