From 5cdee0055d549d26e900433eaca6a6b049dc3694 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Thu, 21 Jun 2018 21:34:44 +0200
Subject: [PATCH] Revert "Debian: no fwaas l3 extensions"

After upstream code has been fixed to work with neutron-api and
neutron-rpc-server, and after this patch has been merged into the Debian
package, we can finally re-activate FWaaS in Debian.

This reverts commit 85a3fa6a0a07692d2e84fea661a2467582787d7f.

Change-Id: Idd94928567677cc46779a8261b436a96a35050e3
---
 manifests/neutron.pp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 9f90842ef..471fdf8fc 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -207,17 +207,10 @@ class openstack_integration::neutron (
     interface_driver => $driver,
     debug            => true,
   }
-  if ($::os_package_type == 'debian') {
-    class { '::neutron::agents::l3':
-      interface_driver => $driver,
-      debug            => true,
-    }
-  } else {
-    class { '::neutron::agents::l3':
-      interface_driver => $driver,
-      debug            => true,
-      extensions       => 'fwaas',
-    }
+  class { '::neutron::agents::l3':
+    interface_driver => $driver,
+    debug            => true,
+    extensions       => 'fwaas',
   }
   class { '::neutron::agents::dhcp':
     interface_driver => $driver,