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
This commit is contained in:
parent
43a2ed4380
commit
5b7bc9f4f9
|
@ -318,10 +318,13 @@ class neutron::agents::ml2::ovs (
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($resource_provider_bandwidths != []) {
|
if ($resource_provider_bandwidths != []) {
|
||||||
$res_prov_bw_map_str = join(any2array($resource_provider_bandwidths), ',')
|
$resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')
|
||||||
neutron_agent_ovs {
|
} else {
|
||||||
'ovs/resource_provider_bandwidths': value => $res_prov_bw_map_str;
|
$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.
|
# TODO(tobias.urdin): Remove in V release.
|
||||||
|
|
|
@ -129,10 +129,12 @@ class neutron::agents::ml2::sriov (
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($resource_provider_bandwidths != []) {
|
if ($resource_provider_bandwidths != []) {
|
||||||
$res_prov_bw_map_str = join(any2array($resource_provider_bandwidths), ',')
|
$resource_provider_bandwidths_real = join(any2array($resource_provider_bandwidths), ',')
|
||||||
neutron_sriov_agent_config {
|
} else {
|
||||||
'sriov_nic/resource_provider_bandwidths': value => $res_prov_bw_map_str;
|
$resource_provider_bandwidths_real = $::os_service_default
|
||||||
}
|
}
|
||||||
|
neutron_sriov_agent_config {
|
||||||
|
'sriov_nic/resource_provider_bandwidths': value => $resource_provider_bandwidths_real;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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('ovs/tun_peer_patch_port').with_ensure('absent')
|
||||||
should contain_neutron_agent_ovs('agent/tunnel_types').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 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>'])
|
should contain_neutron_agent_ovs('agent/explicitly_egress_direct').with_value(['<SERVICE DEFAULT>'])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,8 @@ describe 'neutron::agents::ml2::sriov' do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not configure resource_provider_bandwidths by default' do
|
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
|
end
|
||||||
|
|
||||||
context 'when number_of_vfs is empty' do
|
context 'when number_of_vfs is empty' do
|
||||||
|
|
Loading…
Reference in New Issue