openstack/puppet-neutron
Code Issues Proposed changes

Fix ml2 ovn plugin configuration

Browse Source 
The section name used was wrong. The ovn specific configuration in ml2 config
file should be under [ovn].

Change-Id: Idde9c278ed02fafa4fcaab98f8def56eef595453
This commit is contained in:
Babu Shanmugam 2016-11-02 09:09:56 +00:00
parent 28ca3b3044
commit 769a92bc87
2 changed files with 13 additions and 13 deletions
manifests/plugins/ml2
ovn.pp
spec/classes
neutron_plugins_ml2_ovn_spec.rb

12
manifests/plugins/ml2/ovn.pp

@ -76,11 +76,11 @@ class neutron::plugins::ml2::ovn(
)
neutron_plugin_ml2 {
'ml2_ovn/ovn_nb_connection' : value => $ovn_nb_connection;
'ml2_ovn/ovn_sb_connection' : value => $ovn_sb_connection;
'ml2_ovn/ovsdb_connection_timeout' : value => $ovsdb_connection_timeout;
'ml2_ovn/neutron_sync_mode' : value => $neutron_sync_mode;
'ml2_ovn/ovn_l3_mode' : value => $ovn_l3_mode;
'ml2_ovn/vif_type' : value => $vif_type;
'ovn/ovn_nb_connection' : value => $ovn_nb_connection;
'ovn/ovn_sb_connection' : value => $ovn_sb_connection;
'ovn/ovsdb_connection_timeout' : value => $ovsdb_connection_timeout;
'ovn/neutron_sync_mode' : value => $neutron_sync_mode;
'ovn/ovn_l3_mode' : value => $ovn_l3_mode;
'ovn/vif_type' : value => $vif_type;
}
}

14
spec/classes/neutron_plugins_ml2_ovn_spec.rb

@ -35,12 +35,12 @@ describe 'neutron::plugins::ml2::ovn' do
end
it 'should perform default configuration of' do
is_expected.to contain_neutron_plugin_ml2('ml2_ovn/ovn_nb_connection').with_value(params[:ovn_nb_connection])
is_expected.to contain_neutron_plugin_ml2('ml2_ovn/ovn_sb_connection').with_value(params[:ovn_sb_connection])
is_expected.to contain_neutron_plugin_ml2('ml2_ovn/ovsdb_connection_timeout').with_value(params[:ovsdb_connection_timeout])
is_expected.to contain_neutron_plugin_ml2('ml2_ovn/neutron_sync_mode').with_value(params[:neutron_sync_mode])
is_expected.to contain_neutron_plugin_ml2('ml2_ovn/ovn_l3_mode').with_value(params[:ovn_l3_mode])
is_expected.to contain_neutron_plugin_ml2('ml2_ovn/vif_type').with_value(params[:vif_type])
is_expected.to contain_neutron_plugin_ml2('ovn/ovn_nb_connection').with_value(params[:ovn_nb_connection])
is_expected.to contain_neutron_plugin_ml2('ovn/ovn_sb_connection').with_value(params[:ovn_sb_connection])
is_expected.to contain_neutron_plugin_ml2('ovn/ovsdb_connection_timeout').with_value(params[:ovsdb_connection_timeout])
is_expected.to contain_neutron_plugin_ml2('ovn/neutron_sync_mode').with_value(params[:neutron_sync_mode])
is_expected.to contain_neutron_plugin_ml2('ovn/ovn_l3_mode').with_value(params[:ovn_l3_mode])
is_expected.to contain_neutron_plugin_ml2('ovn/vif_type').with_value(params[:vif_type])
end
end
@ -64,7 +64,7 @@ describe 'neutron::plugins::ml2::ovn' do
params[:vif_type] = 'invalid'
is_expected.to raise_error(Puppet::Error, /Invalid value for vif_type parameter/)
params.delete(:vif_type)
is_expected.to contain_neutron_plugin_ml2('ml2_ovn/vif_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plugin_ml2('ovn/vif_type').with_value('<SERVICE DEFAULT>')
end
end