Merge "Remove remaining parameter of the Nicira NVP plugin"

manifests/config.pp

@@ -83,9 +83,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*plugin_nvp_config*]
-#   (optional) Manage configuration of /etc/neutron/plugins/nicira/nvp.ini
-#
 # [*plugin_linuxbridge_config*]
 #   (optional) Manage configuration of linuxbridge_conf.ini
 #
@@ -120,7 +117,6 @@ class neutron::config (
   $plugin_nuage_config           = {},
   $plugin_ml2_config             = {},
   # DEPRECATED PARAMETERS
-  $plugin_nvp_config             = undef,
   $plugin_linuxbridge_config     = undef,
   $plugin_nsx_config             = undef,
   $linuxbridge_agent_config      = undef,
@@ -128,10 +124,6 @@ class neutron::config (
 
   include neutron::deps
 
-  if $plugin_nvp_config != undef {
-    warning('The plugin_nvp_config parameter is deprecated and has no effect.')
-  }
-
   if $plugin_linuxbridge_config != undef {
     warning('The plugin_linuxbridge_config parameter is deprecated and has no effect.')
   }

releasenotes/notes/cleanup-nvp-plugin-0983eaf44257d7ea.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``neutron::config::plugin_nvp_config`` parameter has been removed.

spec/acceptance/99_neutron_config_spec.rb

@@ -44,7 +44,6 @@ describe 'basic neutron_config resource' do
                           '/etc/neutron/plugins',
                           '/etc/neutron/plugins/linuxbridge',
                           '/etc/neutron/plugins/ml2',
-                          '/etc/neutron/plugins/nicira',
                           '/etc/neutron/plugins/opencontrail',
                           '/etc/neutron/plugins/vmware']