openstack/puppet-neutron
Code Issues Proposed changes

Remove unused resrouce type to manage ml2_conf_sriov.ini

Browse Source 
The ml2_conf_sriov.ini file was removed during Ocata cycle by [1], and
now no additional file is required by neutron-server. This change
removes the resource type because it is not used in any manifest files.

[1] https://review.opendev.org/c/openstack/neutron/+/413439

Change-Id: If959e3751f881107bf5e697f044df99406677bd2
This commit is contained in:
Takashi Kajinami 2022-07-09 23:58:14 +09:00
parent 43558584cd
commit 717436ecab
5 changed files with 4 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/puppet/provider/neutron_plugin_sriov/ini_setting.rb
View File

@ -1,15 +0,0 @@
Puppet::Type.type(:neutron_plugin_sriov).provide(
:ini_setting,
:parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
) do
def self.file_path
'/etc/neutron/plugins/ml2/ml2_conf_sriov.ini'
end
# added for backwards compatibility with older versions of inifile
def file_path
self.class.file_path
end
end

27
lib/puppet/type/neutron_plugin_sriov.rb
View File

@ -1,27 +0,0 @@
Puppet::Type.newtype(:neutron_plugin_sriov) do
ensurable
newparam(:name, :namevar => true) do
desc 'Section/setting name to manage from /etc/neutron/plugins/ml2/ml2_conf_sriov.ini'
newvalues(/\S+\/\S+/)
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('<SERVICE DEFAULT>')
end
autorequire(:anchor) do
['neutron::install::end']
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
end

1
manifests/deps.pp
View File

@ -53,7 +53,6 @@ class neutron::deps {
Anchor['neutron::config::begin'] -> Neutron_plugin_ml2<||> ~> Anchor['neutron::config::end']
Anchor['neutron::config::begin'] -> Neutron_plugin_nuage<||> ~> Anchor['neutron::config::end']
Anchor['neutron::config::begin'] -> Neutron_plugin_opencontrail<||> ~> Anchor['neutron::config::end']
Anchor['neutron::config::begin'] -> Neutron_plugin_sriov<||> ~> Anchor['neutron::config::end']
Anchor['neutron::config::begin'] -> Neutron_sriov_agent_config<||> ~> Anchor['neutron::config::end']
Anchor['neutron::config::begin'] -> Neutron_vpnaas_agent_config<||> ~> Anchor['neutron::config::end']
Anchor['neutron::config::begin'] -> Neutron_vpnaas_service_config<||> ~> Anchor['neutron::config::end']

4
releasenotes/notes/remove-neutron_plugin_sriov-6cb0ac14f025cdf8.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``neutron_plugin_sriov`` resource type has been removed.

22
spec/acceptance/99_neutron_config_spec.rb
View File

@ -15,7 +15,6 @@ describe 'basic neutron_config resource' do
'/etc/neutron/vpn_agent.ini',
'/etc/neutron/plugins/opencontrail/ContrailPlugin.ini',
'/etc/neutron/plugins/vmware/nsx.ini',
'/etc/neutron/plugins/ml2/ml2_conf_sriov.ini',
'/etc/neutron/plugins/ml2/sriov_agent.ini',
'/etc/neutron/plugins/ml2/vpp_agent.ini']
@ -35,7 +34,6 @@ describe 'basic neutron_config resource' do
File <||> -> Neutron_plugin_opencontrail <||>
File <||> -> Neutron_agent_linuxbridge <||>
File <||> -> Neutron_agent_ovs <||>
File <||> -> Neutron_plugin_sriov <||>
File <||> -> Neutron_sriov_agent_config <||>
File <||> -> Neutron_agent_vpp <||>
File <||> -> Neutron_l2gw_agent_config <||>
@ -63,7 +61,6 @@ describe 'basic neutron_config resource' do
'/etc/neutron/vpn_agent.ini',
'/etc/neutron/plugins/opencontrail/ContrailPlugin.ini',
'/etc/neutron/plugins/vmware/nsx.ini',
'/etc/neutron/plugins/ml2/ml2_conf_sriov.ini',
'/etc/neutron/plugins/ml2/sriov_agent.ini',
'/etc/neutron/plugins/ml2/vpp_agent.ini']
@ -308,24 +305,6 @@ describe 'basic neutron_config resource' do
ensure_absent_val => 'toto',
}
neutron_plugin_sriov { 'DEFAULT/thisshouldexist' :
value => 'foo',
}
neutron_plugin_sriov { 'DEFAULT/thisshouldnotexist' :
value => '<SERVICE DEFAULT>',
}
neutron_plugin_sriov { 'DEFAULT/thisshouldexist2' :
value => '<SERVICE DEFAULT>',
ensure_absent_val => 'toto',
}
neutron_plugin_sriov { 'DEFAULT/thisshouldnotexist2' :
value => 'toto',
ensure_absent_val => 'toto',
}
neutron_sriov_agent_config { 'DEFAULT/thisshouldexist' :
value => 'foo',
}
@ -412,7 +391,6 @@ describe 'basic neutron_config resource' do
'neutron_plugin_opencontrail',
'neutron_agent_linuxbridge',
'neutron_agent_ovs',
'neutron_plugin_sriov',
'neutron_sriov_agent_config',
'neutron_agent_vpp',
'neutron_l2gw_service_config',