From 6250f21341a7a54dba70024a3eb4bd00b2347909 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 30 Jul 2020 16:07:55 +0200
Subject: [PATCH] Set firewall_driver for ml2 agents

Dont set it in ml2 class as it's deprecated.

Change-Id: I52de1ad123811ba79b2699ac6cb7f24f2225e605
---
 manifests/neutron.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 177e378cb..575b8af76 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -84,8 +84,8 @@ class openstack_integration::neutron (
         tunnel_types    => ['vxlan'],
         bridge_mappings => ['external:br-ex'],
         manage_vswitch  => false,
+        firewall_driver => 'iptables_hybrid',
       }
-      $firewall_driver  = 'iptables_hybrid'
     }
     'linuxbridge': {
       exec { 'create_dummy_iface':
@@ -98,8 +98,8 @@ class openstack_integration::neutron (
         local_ip                    => $::ipaddress,
         tunnel_types                => ['vxlan'],
         physical_interface_mappings => ['external:loop0'],
+        firewall_driver             => 'iptables',
       }
-      $firewall_driver         = 'iptables'
     }
     default: {
       fail("Unsupported neutron driver (${driver})")
@@ -214,7 +214,6 @@ class openstack_integration::neutron (
     tenant_network_types => ['vxlan', 'vlan', 'flat'],
     extension_drivers    => 'port_security,qos',
     mechanism_drivers    => $driver,
-    firewall_driver      => $firewall_driver,
   }
 
   if $::openstack_integration::config::ssl {