diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index c00fb08dd..5a79a4d63 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -159,10 +159,6 @@ class neutron::plugins::ml2 ( } } - if $::neutron::core_plugin != 'neutron.plugins.ml2.plugin.Ml2Plugin' { - fail('ml2 plugin should be the core_plugin in neutron.conf') - } - if $enable_security_group { neutron_plugin_ml2 { 'securitygroup/firewall_driver': value => $enable_security_group; diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb index 886953dba..badc6fc7c 100644 --- a/spec/classes/neutron_plugins_ml2_spec.rb +++ b/spec/classes/neutron_plugins_ml2_spec.rb @@ -73,17 +73,6 @@ describe 'neutron::plugins::ml2' do end - context 'configure ml2 with wrong core_plugin configured' do - let :pre_condition do - "class { 'neutron': - rabbit_password => 'passw0rd', - core_plugin => 'foo' }" - end - it 'should fails to configure ml2 because core_plugin should contain ML2 class' do - expect { subject }.to raise_error(Puppet::Error, /ml2 plugin should be the core_plugin in neutron.conf/) - end - end - it 'configures ovs plugin' do should_not contain_neutron_plugin_ovs('agent/l2_population').with('value' => true) end