From ac26b748625f41dbbc5d0e4e6d8459b224d80356 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Fri, 19 Dec 2014 14:43:57 +0100
Subject: [PATCH] Load br_netfilter module on Fedora 22+

/proc/sys/net/bridge/* is now provided by br_netfilter module

Change-Id: Ib575bb234991f9d58c40c0472a2f2e99aab74cb3
---
 .../puppet/modules/packstack/manifests/neutron/bridge.pp  | 8 ++++++++
 .../packstack/templates/openstack-neutron.modules.erb     | 1 +
 2 files changed, 9 insertions(+)

diff --git a/packstack/puppet/modules/packstack/manifests/neutron/bridge.pp b/packstack/puppet/modules/packstack/manifests/neutron/bridge.pp
index fbf6af593..81ba8fb7d 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/bridge.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/bridge.pp
@@ -2,6 +2,14 @@
 # Loads bridge modules and sets appropriate sysctl.conf variables
 
 class packstack::neutron::bridge {
+    if $::operatingsystem == 'Fedora' and (is_integer($::operatingsystemrelease) and $::operatingsystemrelease >= 22 or $::operatingsystemrelease == 'Rawhide') {
+        exec { 'load-br-netfilter':
+            path => ['/sbin', '/usr/sbin'],
+            command => 'modprobe -b br_netfilter',
+            logoutput => 'on_failure',
+            before => Exec['load-bridge'],
+        }
+    }
     file { 'bridge-module-loader':
         path => '/etc/sysconfig/modules/openstack-neutron.modules',
         ensure => present,
diff --git a/packstack/puppet/modules/packstack/templates/openstack-neutron.modules.erb b/packstack/puppet/modules/packstack/templates/openstack-neutron.modules.erb
index 8ac4fea87..81cc1b110 100644
--- a/packstack/puppet/modules/packstack/templates/openstack-neutron.modules.erb
+++ b/packstack/puppet/modules/packstack/templates/openstack-neutron.modules.erb
@@ -1,3 +1,4 @@
 #!/bin/sh
 modprobe -b bridge >/dev/null 2>&1
+modprobe -b br_netfilter >/dev/null 2>&1
 exit 0