x/packstack
Code Issues Proposed changes

Load bridge module

Browse Source 
This patch makes sure bridge module is loaded and net.bridge* config
is loaded or makes sysctl fail if it is not loaded.

Reverts If7c0bb538bd0fa995e1fd6a72105d6415ae78ee5 which only hides
this issue and actually solves nothing.

Change-Id: I762f6a88ad4a19d720d762357b71e877315ea182
Fixes: rhbz#1123465
This commit is contained in:
Martin Mágr
2014-10-14 19:53:42 +02:00
parent e18a706c99
commit 1151170f53
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,9 +7,11 @@ class packstack::neutron::bridge {
ensure => present,
mode => 0700,
content => template('packstack/openstack-neutron.modules.erb'),
}
file_line { '/etc/sysctl.conf bridge-nf-call-ip6tables':
} -> exec { 'load-bridge':
path => ['/sbin', '/usr/sbin'],
command => 'modprobe -b bridge',
logoutput => 'on_failure'
} -> file_line { '/etc/sysctl.conf bridge-nf-call-ip6tables':
path => '/etc/sysctl.conf',
line => 'net.bridge.bridge-nf-call-ip6tables=1',
match => 'net.bridge.bridge-nf-call-ip6tables\s*=',
@@ -23,7 +25,7 @@ class packstack::neutron::bridge {
match => 'net.bridge.bridge-nf-call-arptables\s*=',
} -> exec { 'sysctl_refresh':
path => ['/usr/sbin', '/sbin', '/usr/bin', '/bin'],
command => 'sysctl -e -p /etc/sysctl.conf',
command => 'sysctl -p /etc/sysctl.conf',
logoutput => 'on_failure',
}
}