From 09961314b8df19c5b953180884abd777f3669984 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 7 Aug 2015 11:52:06 -0400
Subject: [PATCH] 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
---
 .../neutron_plugin_ovs/ini_setting.rb         | 22 -------------------
 lib/puppet/type/neutron_plugin_ovs.rb         | 18 ---------------
 manifests/config.pp                           |  6 -----
 3 files changed, 46 deletions(-)
 delete mode 100644 lib/puppet/provider/neutron_plugin_ovs/ini_setting.rb
 delete mode 100644 lib/puppet/type/neutron_plugin_ovs.rb

diff --git a/lib/puppet/provider/neutron_plugin_ovs/ini_setting.rb b/lib/puppet/provider/neutron_plugin_ovs/ini_setting.rb
deleted file mode 100644
index 191eeb17d..000000000
--- a/lib/puppet/provider/neutron_plugin_ovs/ini_setting.rb
+++ /dev/null
@@ -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
diff --git a/lib/puppet/type/neutron_plugin_ovs.rb b/lib/puppet/type/neutron_plugin_ovs.rb
deleted file mode 100644
index 205ef763d..000000000
--- a/lib/puppet/type/neutron_plugin_ovs.rb
+++ /dev/null
@@ -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
diff --git a/manifests/config.pp b/manifests/config.pp
index 927fbf3cc..a859477d3 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -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)
 }