diff --git a/lib/puppet/provider/neutron_plugin_sriov/ini_setting.rb b/lib/puppet/provider/neutron_plugin_sriov/ini_setting.rb deleted file mode 100644 index e5d9d9569..000000000 --- a/lib/puppet/provider/neutron_plugin_sriov/ini_setting.rb +++ /dev/null @@ -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 diff --git a/lib/puppet/type/neutron_plugin_sriov.rb b/lib/puppet/type/neutron_plugin_sriov.rb deleted file mode 100644 index de7f8ac57..000000000 --- a/lib/puppet/type/neutron_plugin_sriov.rb +++ /dev/null @@ -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('') - 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 diff --git a/manifests/deps.pp b/manifests/deps.pp index 5976a5b7a..d814279ce 100644 --- a/manifests/deps.pp +++ b/manifests/deps.pp @@ -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'] diff --git a/releasenotes/notes/remove-neutron_plugin_sriov-6cb0ac14f025cdf8.yaml b/releasenotes/notes/remove-neutron_plugin_sriov-6cb0ac14f025cdf8.yaml new file mode 100644 index 000000000..6d1c04f7a --- /dev/null +++ b/releasenotes/notes/remove-neutron_plugin_sriov-6cb0ac14f025cdf8.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``neutron_plugin_sriov`` resource type has been removed. diff --git a/spec/acceptance/99_neutron_config_spec.rb b/spec/acceptance/99_neutron_config_spec.rb index f0ce5bb40..34a8082c2 100644 --- a/spec/acceptance/99_neutron_config_spec.rb +++ b/spec/acceptance/99_neutron_config_spec.rb @@ -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 => '', - } - - neutron_plugin_sriov { 'DEFAULT/thisshouldexist2' : - value => '', - 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',