Browse Source

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
(cherry picked from commit 9fc323f48a)
changes/96/740696/1
Vlad Gridin 1 month ago
parent
commit
7d0406b1a2
2 changed files with 0 additions and 22 deletions
  1. +0
    -4
      manifests/plugins/ml2/nuage.pp
  2. +0
    -18
      spec/classes/neutron_plugins_ml2_nuage_spec.rb

+ 0
- 4
manifests/plugins/ml2/nuage.pp View File

@@ -106,8 +106,4 @@ class neutron::plugins::ml2::nuage (
'RESTPROXY/cms_id': value => $nuage_cms_id;
'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')
}
}

+ 0
- 18
spec/classes/neutron_plugins_ml2_nuage_spec.rb View File

@@ -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])
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
should contain_file(platform_params[:nuage_conf_file]).with(
: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)
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

on_supported_os({


Loading…
Cancel
Save