Merge "Deprecate support for NSX plugin"

lib/puppet/type/neutron_plugin_nsx.rb

@@ -3,7 +3,7 @@ Puppet::Type.newtype(:neutron_plugin_nsx) do
   ensurable
 
   newparam(:name, :namevar => true) do
-    desc 'Section/setting name to manage from vmware/nsx.ini'
+    desc 'Section/setting name to manage from vmware/nsx.ini (DEPRECATED)'
     newvalues(/\S+\/\S+/)
   end
 

manifests/config.pp

@@ -84,9 +84,6 @@
 # [*plugin_ml2_config*]
 #   (optional) Manage configuration of ml2_conf.ini
 #
-# [*plugin_nsx_config*]
-#   (optional) Manage configuration of plugins/vmware/nsx.ini
-#
 # DEPRECATED PARAMETERS
 #
 # [*plugin_nvp_config*]
@@ -95,6 +92,9 @@
 # [*plugin_linuxbridge_config*]
 #   (optional) Manage configuration of linuxbridge_conf.ini
 #
+# [*plugin_nsx_config*]
+#   (optional) Manage configuration of plugins/vmware/nsx.ini
+#
 #   NOTE: The configuration MUST NOT be already handled by this module
 #   or Puppet catalog compilation will fail with duplicate resources.
 #
@@ -120,10 +120,10 @@ class neutron::config (
   $plugin_opencontrail_config    = {},
   $plugin_nuage_config           = {},
   $plugin_ml2_config             = {},
-  $plugin_nsx_config             = {},
   # DEPRECATED PARAMETERS
   $plugin_nvp_config             = undef,
   $plugin_linuxbridge_config     = undef,
+  $plugin_nsx_config             = undef,
 ) {
 
   include neutron::deps
@@ -136,6 +136,13 @@ class neutron::config (
     warning('The plugin_linuxbridge_config parameter is deprecated and has no effect.')
   }
 
+  if $plugin_nsx_config != undef {
+    warning('The plugin_nsx_config parameter is deprecated.')
+    $plugin_nsx_config_real = $plugin_nsx_config
+  } else {
+    $plugin_nsx_config_real = {}
+  }
+
   validate_legacy(Hash, 'validate_hash', $server_config)
   validate_legacy(Hash, 'validate_hash', $api_paste_ini)
   validate_legacy(Hash, 'validate_hash', $ovs_agent_config)
@@ -157,7 +164,7 @@ class neutron::config (
   validate_legacy(Hash, 'validate_hash', $plugin_opencontrail_config)
   validate_legacy(Hash, 'validate_hash', $plugin_nuage_config)
   validate_legacy(Hash, 'validate_hash', $plugin_ml2_config)
-  validate_legacy(Hash, 'validate_hash', $plugin_nsx_config)
+  validate_legacy(Hash, 'validate_hash', $plugin_nsx_config_real)
 
   create_resources('neutron_config', $server_config)
   create_resources('neutron_api_paste_ini', $api_paste_ini)
@@ -180,5 +187,5 @@ class neutron::config (
   create_resources('neutron_plugin_opencontrail', $plugin_opencontrail_config)
   create_resources('neutron_plugin_nuage', $plugin_nuage_config)
   create_resources('neutron_plugin_ml2', $plugin_ml2_config)
-  create_resources('neutron_plugin_nsx', $plugin_nsx_config)
+  create_resources('neutron_plugin_nsx', $plugin_nsx_config_real)
 }

manifests/plugins/nsx.pp

@@ -1,4 +1,5 @@
 #
+# DEPRECATED !!
 # Configure the VMware NSX plugin for neutron.
 #
 # === Parameters
@@ -86,6 +87,8 @@ class neutron::plugins::nsx (
   include neutron::deps
   include neutron::params
 
+  warning('Support for NSX plugin has been deprecated and will be removed.')
+
   package { 'vmware-nsx':
     ensure => $package_ensure,
     name   => $::neutron::params::nsx_plugin_package,

releasenotes/notes/deprecate-nsx-039f4a3daaf6e56b.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Support for the NSX plugin has been deprecated and will be removed in
+    a future release.