diff --git a/lib/puppet/provider/neutron_plugin_linuxbridge/ini_setting.rb b/lib/puppet/provider/neutron_plugin_linuxbridge/ini_setting.rb deleted file mode 100644 index 04b6ce983..000000000 --- a/lib/puppet/provider/neutron_plugin_linuxbridge/ini_setting.rb +++ /dev/null @@ -1,15 +0,0 @@ -Puppet::Type.type(:neutron_plugin_linuxbridge).provide( - :ini_setting, - :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting) -) do - - def self.file_path - '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini' - end - - # added for backwards compatibility with older versions of inifile - def file_path - self.class.file_path - end - -end diff --git a/lib/puppet/type/neutron_plugin_linuxbridge.rb b/lib/puppet/type/neutron_plugin_linuxbridge.rb deleted file mode 100644 index 808b8da00..000000000 --- a/lib/puppet/type/neutron_plugin_linuxbridge.rb +++ /dev/null @@ -1,24 +0,0 @@ -Puppet::Type.newtype(:neutron_plugin_linuxbridge) do - - ensurable - - newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from linuxbridge_conf.ini (DEPRECATED)' - newvalues(/\S+\/\S+/) - end - - newproperty(:value) do - desc 'The value of the setting to be defined.' - munge do |value| - value = value.to_s.strip - value.capitalize! if value =~ /^(true|false)$/i - value - end - end - - newparam(:ensure_absent_val) do - desc 'A value that is specified as the value property will behave as if ensure => absent was specified' - defaultto('') - end - -end diff --git a/manifests/config.pp b/manifests/config.pp index 0dd15426c..ec6859b28 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -83,9 +83,6 @@ # # DEPRECATED PARAMETERS # -# [*plugin_linuxbridge_config*] -# (optional) Manage configuration of linuxbridge_conf.ini -# # [*plugin_nsx_config*] # (optional) Manage configuration of plugins/vmware/nsx.ini # @@ -117,17 +114,12 @@ class neutron::config ( $plugin_nuage_config = {}, $plugin_ml2_config = {}, # DEPRECATED PARAMETERS - $plugin_linuxbridge_config = undef, $plugin_nsx_config = undef, $linuxbridge_agent_config = undef, ) { include neutron::deps - if $plugin_linuxbridge_config != undef { - warning('The plugin_linuxbridge_config parameter is deprecated and has no effect.') - } - if $plugin_nsx_config != undef { warning('The plugin_nsx_config parameter is deprecated.') $plugin_nsx_config_real = $plugin_nsx_config diff --git a/manifests/deps.pp b/manifests/deps.pp index d814279ce..dacaa4f4d 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -48,7 +48,6 @@ class neutron::deps { Anchor['neutron::config::begin'] -> Neutron_metadata_agent_config<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_metering_agent_config<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_bgp_dragent_config<||> ~> Anchor['neutron::config::end'] - Anchor['neutron::config::begin'] -> Neutron_plugin_linuxbridge<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_l2gw_service_config<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_plugin_ml2<||> ~> Anchor['neutron::config::end'] Anchor['neutron::config::begin'] -> Neutron_plugin_nuage<||> ~> Anchor['neutron::config::end'] diff --git a/releasenotes/notes/remove-neutron_plugin_linuxbridge-bb4695f5dfe47c74.yaml b/releasenotes/notes/remove-neutron_plugin_linuxbridge-bb4695f5dfe47c74.yaml new file mode 100644 index 000000000..414e8e9e6 --- /dev/null +++ b/releasenotes/notes/remove-neutron_plugin_linuxbridge-bb4695f5dfe47c74.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The ``neutron::config::plugin_linuxbridge_config`` parameter has been + removed. + + - | + The ``neutron_plugin_linuxbridge`` resource type has been removed. diff --git a/spec/acceptance/99_neutron_config_spec.rb b/spec/acceptance/99_neutron_config_spec.rb index fee86d384..0302d5c0e 100644 --- a/spec/acceptance/99_neutron_config_spec.rb +++ b/spec/acceptance/99_neutron_config_spec.rb @@ -10,7 +10,6 @@ describe 'basic neutron_config resource' do '/etc/neutron/metering_agent.ini', '/etc/neutron/l2gw_plugin.ini', '/etc/neutron/l2gateway_agent.ini', - '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini', '/etc/neutron/plugins/ml2/ml2_conf.ini', '/etc/neutron/vpn_agent.ini', '/etc/neutron/plugins/opencontrail/ContrailPlugin.ini', @@ -27,7 +26,6 @@ describe 'basic neutron_config resource' do File <||> -> Neutron_l3_agent_config <||> File <||> -> Neutron_metadata_agent_config <||> File <||> -> Neutron_metering_agent_config <||> - File <||> -> Neutron_plugin_linuxbridge <||> File <||> -> Neutron_plugin_ml2 <||> File <||> -> Neutron_l2gw_service_config <||> File <||> -> Neutron_vpnaas_agent_config <||> @@ -42,7 +40,6 @@ describe 'basic neutron_config resource' do $neutron_directories = ['/etc/neutron', '/etc/neutron/plugins', - '/etc/neutron/plugins/linuxbridge', '/etc/neutron/plugins/ml2', '/etc/neutron/plugins/opencontrail', '/etc/neutron/plugins/vmware'] @@ -55,7 +52,6 @@ describe 'basic neutron_config resource' do '/etc/neutron/metering_agent.ini', '/etc/neutron/l2gw_plugin.ini', '/etc/neutron/l2gateway_agent.ini', - '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini', '/etc/neutron/plugins/ml2/ml2_conf.ini', '/etc/neutron/vpn_agent.ini', '/etc/neutron/plugins/opencontrail/ContrailPlugin.ini', @@ -178,24 +174,6 @@ describe 'basic neutron_config resource' do ensure_absent_val => 'toto', } - neutron_plugin_linuxbridge { 'DEFAULT/thisshouldexist' : - value => 'foo', - } - - neutron_plugin_linuxbridge { 'DEFAULT/thisshouldnotexist' : - value => '', - } - - neutron_plugin_linuxbridge { 'DEFAULT/thisshouldexist2' : - value => '', - ensure_absent_val => 'toto', - } - - neutron_plugin_linuxbridge { 'DEFAULT/thisshouldnotexist2' : - value => 'toto', - ensure_absent_val => 'toto', - } - neutron_plugin_ml2 { 'DEFAULT/thisshouldexist' : value => 'foo', } @@ -383,7 +361,6 @@ describe 'basic neutron_config resource' do 'neutron_dhcp_agent_config', 'neutron_l3_agent_config', 'neutron_metadata_agent_config', - 'neutron_plugin_linuxbridge', 'neutron_metering_agent_config', 'neutron_plugin_ml2', 'neutron_vpnaas_agent_config',