Nuage: remove check on mechanism driver
Nuage neutron integration has a collection of mechanism drivers sharing same configuration. This patchset removes check on nuage ml2 mechanism driver which is not mandatory anymore. Change-Id: Id6e609d0a556e23c484f38f4651d2709d898a76c
This commit is contained in:
parent
de2be7503c
commit
9fc323f48a
|
@ -106,8 +106,4 @@ class neutron::plugins::ml2::nuage (
|
||||||
'RESTPROXY/cms_id': value => $nuage_cms_id;
|
'RESTPROXY/cms_id': value => $nuage_cms_id;
|
||||||
'PLUGIN/default_allow_non_ip': value => $nuage_default_allow_non_ip;
|
'PLUGIN/default_allow_non_ip': value => $nuage_default_allow_non_ip;
|
||||||
}
|
}
|
||||||
|
|
||||||
if $::neutron::core_plugin != 'ml2' or !('nuage' in $::neutron::plugins::ml2::mechanism_drivers) {
|
|
||||||
fail('Nuage should be the mechanism driver in neutron.conf')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,15 +56,6 @@ describe 'neutron::plugins::ml2::nuage' do
|
||||||
should contain_neutron_plugin_nuage('PLUGIN/default_allow_non_ip').with_value(params[:nuage_default_allow_non_ip])
|
should contain_neutron_plugin_nuage('PLUGIN/default_allow_non_ip').with_value(params[:nuage_default_allow_non_ip])
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'configure ml2 nuage with wrong core_plugin configuration' do
|
|
||||||
let :pre_condition do
|
|
||||||
"class { 'neutron':
|
|
||||||
core_plugin => 'foo' }"
|
|
||||||
end
|
|
||||||
|
|
||||||
it { should raise_error(Puppet::Error, /Nuage should be the mechanism driver in neutron.conf/) }
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should have a nuage plugin conf file' do
|
it 'should have a nuage plugin conf file' do
|
||||||
should contain_file(platform_params[:nuage_conf_file]).with(
|
should contain_file(platform_params[:nuage_conf_file]).with(
|
||||||
:ensure => platform_params[:nuage_file_ensure],
|
:ensure => platform_params[:nuage_file_ensure],
|
||||||
|
@ -80,15 +71,6 @@ describe 'neutron::plugins::ml2::nuage' do
|
||||||
should contain_neutron_plugin_nuage('PLUGIN/default_allow_non_ip').with_value(true)
|
should contain_neutron_plugin_nuage('PLUGIN/default_allow_non_ip').with_value(true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'configure ml2 nuage with wrong mechanism_driver configuration' do
|
|
||||||
let :pre_condition do
|
|
||||||
"class { 'neutron::plugins::ml2':
|
|
||||||
mechanism_drivers => ['bar'] }"
|
|
||||||
end
|
|
||||||
|
|
||||||
it { should raise_error(Puppet::Error, /Nuage should be the mechanism driver in neutron.conf/) }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
on_supported_os({
|
on_supported_os({
|
||||||
|
|
Loading…
Reference in New Issue