From 9fc323f48a466dfb5bc64c048a67ce878599ff2f Mon Sep 17 00:00:00 2001 From: Vlad Gridin Date: Tue, 7 Jul 2020 07:02:08 +0200 Subject: [PATCH] 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 --- manifests/plugins/ml2/nuage.pp | 4 ---- spec/classes/neutron_plugins_ml2_nuage_spec.rb | 18 ------------------ 2 files changed, 22 deletions(-) diff --git a/manifests/plugins/ml2/nuage.pp b/manifests/plugins/ml2/nuage.pp index 7b690fa01..44f406c5b 100644 --- a/manifests/plugins/ml2/nuage.pp +++ b/manifests/plugins/ml2/nuage.pp @@ -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') - } } diff --git a/spec/classes/neutron_plugins_ml2_nuage_spec.rb b/spec/classes/neutron_plugins_ml2_nuage_spec.rb index 3c11b8a90..68afa36a8 100644 --- a/spec/classes/neutron_plugins_ml2_nuage_spec.rb +++ b/spec/classes/neutron_plugins_ml2_nuage_spec.rb @@ -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({