From fdee45303f39847ab408e7f6aa8112c0a7241304 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 23 Nov 2021 10:16:30 +0900
Subject: [PATCH] Remove deprecated tempest::neutron_fwaas_available

... because the parameter was deprecated during Train cycle[1].

[1] 30ab1da275449685a4d5ff0a9479788988632252

Change-Id: I9fd40825e1a80b9afc640fbb4c26cebbcdd6f3a9
---
 manifests/init.pp                                         | 8 --------
 .../remove-neutron_fwaas_available-34d5e8fcf80e083e.yaml  | 4 ++++
 2 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/remove-neutron_fwaas_available-34d5e8fcf80e083e.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 58a3723b..bae11e5f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -217,9 +217,6 @@
 #   Defaults to 'Member'
 #
 # DEPREACTED PARAMETERS
-#  [*neutron_fwaas_available*]
-#   Just for backwards compatibility, it actually does nothing as fwaas plugin
-#   is integrated in neutron tempest plugin.
 #  [*congress_available*]
 #   Defaults to undef
 #  [*img_dir*]
@@ -364,7 +361,6 @@ class tempest(
   # ec2api options
   $ec2api_tester_roles              = ['Member'],
   # DEPRECATED PARAMETERS
-  $neutron_fwaas_available          = undef,
   $congress_available               = undef,
   $img_dir                          = undef,
   $panko_available                  = undef,
@@ -377,10 +373,6 @@ class tempest(
     $tempest_roles_real = $::os_service_default
   }
 
-  if $neutron_fwaas_available {
-    warning('The tempest::neutron_fwaas_available parameter is deprecated. FWaaS plugin is now part of neutron plugin.')
-  }
-
   if $img_dir != undef {
     warning('The tempest::img_dir parameter is deperecated. Set full path in img_file parameter instead')
     if $img_file == undef {
diff --git a/releasenotes/notes/remove-neutron_fwaas_available-34d5e8fcf80e083e.yaml b/releasenotes/notes/remove-neutron_fwaas_available-34d5e8fcf80e083e.yaml
new file mode 100644
index 00000000..3223c261
--- /dev/null
+++ b/releasenotes/notes/remove-neutron_fwaas_available-34d5e8fcf80e083e.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The ``tempest::neutron_fwaas_available`` parameter has been removed.