openstack/puppet-neutron
Code Issues Proposed changes

Merge "Write missing tunnel_types option for linuxbridge agent"

Browse Source
This commit is contained in:
Jenkins 2016-03-31 04:00:17 +00:00 committed by Gerrit Code Review
commit 0fd3576b06
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,16 @@ class neutron::agents::ml2::linuxbridge (
} }
} }
if size($tunnel_types) > 0 {
neutron_agent_linuxbridge {
'agent/tunnel_types': value => join($tunnel_types, ',');
}
} else {
neutron_agent_linuxbridge {
'agent/tunnel_types': ensure => absent;
}
}
neutron_agent_linuxbridge { neutron_agent_linuxbridge {
'agent/polling_interval': value => $polling_interval; 'agent/polling_interval': value => $polling_interval;
'linux_bridge/physical_interface_mappings': value => join($physical_interface_mappings, ','); 'linux_bridge/physical_interface_mappings': value => join($physical_interface_mappings, ',');

2
spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
View File

@ -35,6 +35,7 @@ describe 'neutron::agents::ml2::linuxbridge' do
is_expected.to contain_neutron_agent_linuxbridge('agent/polling_interval').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_agent_linuxbridge('agent/polling_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_agent_linuxbridge('linux_bridge/physical_interface_mappings').with_value(default_params[:physical_interface_mappings].join(',')) is_expected.to contain_neutron_agent_linuxbridge('linux_bridge/physical_interface_mappings').with_value(default_params[:physical_interface_mappings].join(','))
is_expected.to contain_neutron_agent_linuxbridge('securitygroup/firewall_driver').with_value(default_params[:firewall_driver]) is_expected.to contain_neutron_agent_linuxbridge('securitygroup/firewall_driver').with_value(default_params[:firewall_driver])
is_expected.to contain_neutron_agent_linuxbridge('agent/tunnel_types').with_ensure('absent')
end end
it 'installs neutron linuxbridge agent package' do it 'installs neutron linuxbridge agent package' do
@ -96,6 +97,7 @@ describe 'neutron::agents::ml2::linuxbridge' do
is_expected.to contain_neutron_agent_linuxbridge('vxlan/vxlan_ttl').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_agent_linuxbridge('vxlan/vxlan_ttl').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_agent_linuxbridge('vxlan/vxlan_tos').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_agent_linuxbridge('vxlan/vxlan_tos').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_agent_linuxbridge('vxlan/l2_population').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_agent_linuxbridge('vxlan/l2_population').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_agent_linuxbridge('agent/tunnel_types').with_value(params[:tunnel_types])
end end
end end