openstack/puppet-neutron
Code Issues Proposed changes

Remove check for correct core_plugin when using ml2.

Browse Source 
This checks fails, because $::neutron::core_plugin
is not available in the context of ml2.pp.

Change-Id: I96c11c5a57c530f72e0e71447831b8219c12a685
This commit is contained in:
Benedikt Trefzer
2014-01-16 09:27:08 +01:00
parent 8654569fb4
commit 2cc78fb785
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/plugins/ml2.pp
View File

@@ -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;

11
spec/classes/neutron_plugins_ml2_spec.rb
View File

@@ -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