drop neutron_plugin_ovs type/provider

In Kilo, we removed Neutron OVS plugin because it was dropped in Juno in
favor of using ML2 plugin.

We missed to drop the neutron_plugin_ovs type/provider in the patch and
this is what this patch aims about.

Change-Id: Ic9addc51de43ec67db4835072be61e1306281611
This commit is contained in:
Emilien Macchi
2015-08-07 11:52:06 -04:00
parent ff38d8d3ac
commit 09961314b8
3 changed files with 0 additions and 46 deletions

View File

@@ -1,22 +0,0 @@
Puppet::Type.type(:neutron_plugin_ovs).provide(
:ini_setting,
:parent => Puppet::Type.type(:ini_setting).provider(:ruby)
) do
def section
resource[:name].split('/', 2).first
end
def setting
resource[:name].split('/', 2).last
end
def separator
'='
end
def file_path
'/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini'
end
end

View File

@@ -1,18 +0,0 @@
Puppet::Type.newtype(:neutron_plugin_ovs) do
ensurable
newparam(:name, :namevar => true) do
desc 'Section/setting name to manage from ovs_neutron_plugin.ini'
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
end

View File

@@ -66,9 +66,6 @@
# [**plugin_ml2_config**]
# (optional) Manage configuration of ml2_conf.ini
#
# [**plugin_ovs_config**]
# (optional) Manage configuration of ovs_neutron_plugin.ini
#
# NOTE: The configuration MUST NOT be already handled by this module
# or Puppet catalog compilation will fail with duplicate resources.
#
@@ -89,7 +86,6 @@ class neutron::config (
$plugin_plumgrid_config = {},
$plugin_opencontrail_config = {},
$plugin_ml2_config = {},
$plugin_ovs_config = {},
) {
validate_hash($server_config)
@@ -108,7 +104,6 @@ class neutron::config (
validate_hash($plugin_plumgrid_config)
validate_hash($plugin_opencontrail_config)
validate_hash($plugin_ml2_config)
validate_hash($plugin_ovs_config)
create_resources('neutron_config', $server_config)
create_resources('neutron_api_config', $api_config)
@@ -125,5 +120,4 @@ class neutron::config (
create_resources('neutron_plugin_plumgrid', $plugin_plumgrid_config)
create_resources('neutron_plugin_opencontrail', $plugin_opencontrail_config)
create_resources('neutron_plugin_ml2', $plugin_ml2_config)
create_resources('neutron_plugin_ovs', $plugin_ovs_config)
}