openstack/puppet-neutron
Code Issues Proposed changes

linuxbridge: don't set enable_vxlan = True

Browse Source 
It's the default value since Liberty:
I8a99c973b4816e3a2845cdb8abd71d6250bc4800

Change-Id: Id6fcb8d97103e7c00c78ef6f1f9cc79b4642c19a
This commit is contained in:
Ihar Hrachyshka 2016-12-03 03:18:29 +00:00
parent ff1124caaa
commit 6c1ebe76dd
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,6 @@ class neutron::agents::ml2::linuxbridge (
'vxlan/ttl': value => $vxlan_ttl;
'vxlan/vxlan_group': value => $vxlan_group;
'vxlan/tos': value => $vxlan_tos;
'vxlan/enable_vxlan': value => true;
'vxlan/local_ip': value => $local_ip;
'vxlan/l2_population': value => $l2_population;
}

2
spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
View File

@ -98,7 +98,6 @@ describe 'neutron::agents::ml2::linuxbridge' do
context 'when providing all parameters' do
it 'configures ml2_conf.ini' do
is_expected.to contain_neutron_agent_linuxbridge('vxlan/enable_vxlan').with_value(true)
is_expected.to contain_neutron_agent_linuxbridge('vxlan/local_ip').with_value(params[:local_ip])
is_expected.to contain_neutron_agent_linuxbridge('vxlan/vxlan_group').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_agent_linuxbridge('vxlan/ttl').with_value('<SERVICE DEFAULT>')
@ -119,7 +118,6 @@ describe 'neutron::agents::ml2::linuxbridge' do
end
it 'configures ml2_conf.ini' do
is_expected.to contain_neutron_agent_linuxbridge('vxlan/enable_vxlan').with_value(true)
is_expected.to contain_neutron_agent_linuxbridge('vxlan/local_ip').with_value(params[:local_ip])
is_expected.to contain_neutron_agent_linuxbridge('vxlan/vxlan_group').with_value(params[:vxlan_group])
is_expected.to contain_neutron_agent_linuxbridge('vxlan/ttl').with_value(params[:vxlan_ttl])