Merge "Deprecate support for Contrail Neutron plugin"

lib/puppet/type/neutron_plugin_opencontrail.rb

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

manifests/config.pp

@@ -78,9 +78,6 @@
 # [*bgp_dragent_config*]
 #   (optional) Manage configuration of bgp_dragent.ini
 #
-# [*plugin_opencontrail_config*]
-#   (optional) Manage configuration of plugins/opencontrail/ContrailPlugin.ini
-#
 # [*plugin_ml2_config*]
 #   (optional) Manage configuration of ml2_conf.ini
 #
@@ -92,6 +89,9 @@
 # [*plugin_nuage_config*]
 #   (optional) Manage configuration of plugins/nuage/plugin.ini
 #
+# [*plugin_opencontrail_config*]
+#   (optional) Manage configuration of plugins/opencontrail/ContrailPlugin.ini
+#
 #   NOTE: The configuration MUST NOT be already handled by this module
 #   or Puppet catalog compilation will fail with duplicate resources.
 #
@@ -115,11 +115,11 @@ class neutron::config (
   Hash $vpnaas_agent_config           = {},
   Hash $vpnaas_service_config         = {},
   Hash $bgp_dragent_config            = {},
-  Hash $plugin_opencontrail_config    = {},
   Hash $plugin_ml2_config             = {},
   # DEPRECATED PARAMETERS
-  Optional[Hash] $linuxbridge_agent_config = undef,
-  Optional[Hash] $plugin_nuage_config      = undef,
+  Optional[Hash] $linuxbridge_agent_config   = undef,
+  Optional[Hash] $plugin_nuage_config        = undef,
+  Optional[Hash] $plugin_opencontrail_config = undef,
 ) {
 
   include neutron::deps
@@ -135,6 +135,13 @@ class neutron::config (
     warning('The plugin_nuage_config parameter is deprecated and has no effect.')
   }
 
+  if $plugin_opencontrail_config != undef {
+    warning('The plugin_opencontrail_config parameter is deprecated.')
+    $plugin_opencontrail_config_real = $plugin_opencontrail_config
+  } else {
+    $plugin_opencontrail_config_real = {}
+  }
+
   create_resources('neutron_config', $server_config)
   create_resources('neutron_api_paste_ini', $api_paste_ini)
   create_resources('neutron_agent_ovs', $ovs_agent_config)
@@ -155,6 +162,6 @@ class neutron::config (
   create_resources('neutron_vpnaas_agent_config', $vpnaas_agent_config)
   create_resources('neutron_vpnaas_service_config', $vpnaas_service_config)
   create_resources('neutron_bgp_dragent_config', $bgp_dragent_config)
-  create_resources('neutron_plugin_opencontrail', $plugin_opencontrail_config)
+  create_resources('neutron_plugin_opencontrail', $plugin_opencontrail_config_real)
   create_resources('neutron_plugin_ml2', $plugin_ml2_config)
 }

manifests/plugins/opencontrail.pp

@@ -1,3 +1,4 @@
+# DEPRECATED !!!
 # This class installs and configures Opencontrail Neutron Plugin.
 #
 # === Parameters
@@ -49,6 +50,8 @@ class neutron::plugins::opencontrail (
   include neutron::deps
   include neutron::params
 
+  warning('Support for contrail plugin has been deprecated.')
+
   $contrail_extensions_real = $contrail_extensions ? {
     Hash    => join(join_keys_to_values($contrail_extensions, ':'), ','),
     default => join(any2array($contrail_extensions), ','),

releasenotes/notes/deprecate-contrail-plugin-4c74ebcd02522deb.yaml

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