From c4918bea490d9f0c80a8b9f8bfa42b5bb59cf9ae Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 11 Sep 2021 22:11:42 +0900
Subject: [PATCH] Remove remaining ineffective parameter for plumgrid plugin

The plumgrid plugin is no longer supported since Wallaby[1]. This
change removes the remaining deprecated parameter to clean up all
related implementations.

[1] f7c40f7056d16ce69d5e7cce7c5d93794a007a9a

Change-Id: Id43ffae22cb5795246c9fe8d7682b2cca49ed50e
---
 manifests/config.pp                                       | 8 --------
 releasenotes/notes/cleanup-plumgrid-6ae80b90642507c2.yaml | 4 ++++
 2 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/cleanup-plumgrid-6ae80b90642507c2.yaml

diff --git a/manifests/config.pp b/manifests/config.pp
index b5eceb937..c9909e3a8 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -92,9 +92,6 @@
 # [*api_config*]
 #   (optional) Manage configuration of api-paste.ini
 #
-# [*plugin_plumgrid_config*]
-#   (optional) Manage configuration of plugins/plumgrid/plumgrid.ini
-#
 # [*plugin_midonet_config*]
 #   (optional) Manage configuration of plugins/midonet/midonet.ini
 #
@@ -126,16 +123,11 @@ class neutron::config (
   $plugin_nvp_config             = {},
   # DEPRECATED PARAMETERS
   $api_config                    = undef,
-  $plugin_plumgrid_config        = undef,
   $plugin_midonet_config         = undef,
 ) {
 
   include neutron::deps
 
-  if $plugin_plumgrid_config != undef {
-    warning('The plugin_plumgrid_config parameter was deprecated and has no effect')
-  }
-
   if $api_config != undef {
     warning('The neutron::config::api_config parameter has been deprecated and \
 will be removed in a future release. Use the api_paste_ini parameter instead.')
diff --git a/releasenotes/notes/cleanup-plumgrid-6ae80b90642507c2.yaml b/releasenotes/notes/cleanup-plumgrid-6ae80b90642507c2.yaml
new file mode 100644
index 000000000..6c4662444
--- /dev/null
+++ b/releasenotes/notes/cleanup-plumgrid-6ae80b90642507c2.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``neutron::config::plugin_plumgrid_config`` parameter has been removed.