x/packstack
Code Issues Proposed changes

load br_netfilter module if necessary

Browse Source 
This change causes the 'br_netfilter' kernel module to be loaded if the
'bridge' module does not provide the net.bridge.* sysctls.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1189681

Change-Id: Icafa41c3511af3e3be6339022e89d4b14cbbaf99
(cherry picked from commit 0a7304ebb2)
This commit is contained in:
Lars Kellogg-Stedman
2015-02-05 16:54:47 -05:00
committed by Alan Pevec
parent f3425ac0ad
commit 25ced1296f
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packstack/puppet/modules/packstack/manifests/neutron/bridge.pp
View File

@@ -2,14 +2,6 @@
# Loads bridge modules and sets appropriate sysctl.conf variables # Loads bridge modules and sets appropriate sysctl.conf variables
class packstack::neutron::bridge { 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': file { 'bridge-module-loader':
path => '/etc/sysconfig/modules/openstack-neutron.modules', path => '/etc/sysconfig/modules/openstack-neutron.modules',
ensure => present, ensure => present,
@@ -19,6 +11,11 @@ class packstack::neutron::bridge {
path => ['/sbin', '/usr/sbin'], path => ['/sbin', '/usr/sbin'],
command => 'modprobe -b bridge', command => 'modprobe -b bridge',
logoutput => 'on_failure' logoutput => 'on_failure'
} -> exec { 'load-bridge-netfilter':
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],
command => 'modprobe -b br_netfilter',
logoutput => 'on_failure',
unless => 'test -d /proc/sys/net/bridge'
} -> file_line { '/etc/sysctl.conf bridge-nf-call-ip6tables': } -> file_line { '/etc/sysctl.conf bridge-nf-call-ip6tables':
path => '/etc/sysctl.conf', path => '/etc/sysctl.conf',
line => 'net.bridge.bridge-nf-call-ip6tables=1', line => 'net.bridge.bridge-nf-call-ip6tables=1',