From 5758b34e4b87d28b959811474ea45e718306c541 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 30 Jul 2020 16:10:37 +0200
Subject: [PATCH] Remove deprecated firewall_driver

Depends-On: https://review.opendev.org/743980
Change-Id: Ia2c7c7ca12d381144c87345dde0415a4e775444d
---
 manifests/plugins/ml2.pp                           | 14 --------------
 ...eprecated-firewall-driver-51f418ed444de6cf.yaml |  5 +++++
 spec/classes/neutron_plugins_ml2_spec.rb           |  2 +-
 3 files changed, 6 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-firewall-driver-51f418ed444de6cf.yaml

diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp
index 81d72469c..8a5126685 100644
--- a/manifests/plugins/ml2.pp
+++ b/manifests/plugins/ml2.pp
@@ -123,12 +123,6 @@
 #   are 4 and 6.
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*firewall_driver*]
-#   (optional) Firewall driver for realizing neutron security group function.
-#   Defaults to undef
-#
 class neutron::plugins::ml2 (
   $type_drivers              = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
   $extension_drivers         = $::os_service_default,
@@ -146,19 +140,11 @@ class neutron::plugins::ml2 (
   $purge_config              = false,
   $max_header_size           = $::os_service_default,
   $overlay_ip_version        = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $firewall_driver           = undef,
 ) {
 
   include neutron::deps
   include neutron::params
 
-  if $firewall_driver != undef {
-    warning('Using "firewall_driver" option in the ml2 plugin is deprecated \
-and have no any effect. This option should be set in the L2 agent. \
-It will be removed in the future releases.')
-  }
-
   if ! $mechanism_drivers {
     warning('Without networking mechanism driver, ml2 will not communicate with L2 agents')
   }
diff --git a/releasenotes/notes/remove-deprecated-firewall-driver-51f418ed444de6cf.yaml b/releasenotes/notes/remove-deprecated-firewall-driver-51f418ed444de6cf.yaml
new file mode 100644
index 000000000..f45f53078
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-firewall-driver-51f418ed444de6cf.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated neutron::plugins::ml2::firewall_driver parameter is removed.
+    Please set the firewall_driver in the ML2 agent classes in neutron::agents::ml2 instead.
diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb
index b37d2891f..e2e83a82c 100644
--- a/spec/classes/neutron_plugins_ml2_spec.rb
+++ b/spec/classes/neutron_plugins_ml2_spec.rb
@@ -101,7 +101,7 @@ describe 'neutron::plugins::ml2' do
           :enable_security_group => true,
         )
       end
-      it 'configures enable_security_group and firewall_driver options' do
+      it 'configures enable_security_group' do
         should contain_neutron_plugin_ml2('securitygroup/enable_security_group').with_value('true')
       end
     end