Attachment 691296 Details for Bug 877704 – Add sysctl modules script for linuxbridge

[patch] Add sysctl modules script for linuxbridge

add_openstack-quantum-linuxbridge.modules.patch (text/plain), 2.89 KB, created by Terry Wilson on 2013-02-01 00:27:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Terry Wilson

Created: 2013-02-01 00:27:23 UTC

Size: 2.89 KB

patch

obsolete

>commit b67f24efe236305ab8757da292d6fd5b8c41f783
>Author: twilson <twilson@rhel6.(none)>
>Date:   Thu Jan 31 16:59:13 2013 -0600
>
>    Ensure sysctl can set net.bridge.bridge-nf-call*=0
>    
>    Currently, /etc/sysctl.conf tries to set:
>      net.bridge.bridge-nf-call-ip6tables = 0
>      net.bridge.bridge-nf-call-iptables = 0
>      net.bridge.bridge-nf-call-arptables = 0
>    
>    This can fail because the bridge module is not loaded, so add a
>    /etc/sysconfig/modules/openstack-quantum-linuxbridge.modules script
>    to load the bridge module. Only an issue when netns not supported.
>    
>    Resolves: rhbz#https://bugzilla.redhat.com/show_bug.cgi?id=877704
>
>diff --git a/openstack-quantum-linuxbridge.modules b/openstack-quantum-linuxbridge.modules
>new file mode 100644
>index 0000000..1e3f57e
>--- /dev/null
>+++ b/openstack-quantum-linuxbridge.modules
>@@ -0,0 +1,5 @@
>+#!/bin/sh
>+
>+modprobe -b bridge >/dev/null 2>&1
>+
>+exit 0
>diff --git a/openstack-quantum.spec b/openstack-quantum.spec
>index 1093d77..9b63ebb 100644
>--- a/openstack-quantum.spec
>+++ b/openstack-quantum.spec
>@@ -4,7 +4,7 @@
> 
> Name:		openstack-quantum
> Version:	2012.2.1
>-Release:	6%{?dist}
>+Release:	7%{?dist}
> Summary:	Virtual network service for OpenStack (quantum)
> 
> Group:		Applications/System
>@@ -23,6 +23,7 @@ Source10:	quantum-server.init
> Source20:	quantum-server.upstart
> Source11:	quantum-linuxbridge-agent.init
> Source21:	quantum-linuxbridge-agent.upstart
>+Source31:	openstack-quantum-linuxbridge.modules
> Source12:	quantum-openvswitch-agent.init
> Source22:	quantum-openvswitch-agent.upstart
> Source13:	quantum-ryu-agent.init
>@@ -314,6 +315,9 @@ install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/quantum-dhcp-agent
> install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/quantum-l3-agent
> install -p -D -m 755 %{SOURCE17} %{buildroot}%{_initrddir}/quantum-ovs-cleanup
> 
>+# Install sysconfig module scripts
>+install -p -D -m 755 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/modules/openstack-quantum-linuxbridge.modules
>+
> # Setup directories
> install -d -m 755 %{buildroot}%{_datadir}/quantum
> install -d -m 755 %{buildroot}%{_sharedstatedir}/quantum
>@@ -534,6 +538,7 @@ fi
> %{_datadir}/quantum/quantum-linuxbridge-agent.upstart
> %{python_sitelib}/quantum/plugins/linuxbridge
> %{_datarootdir}/quantum/rootwrap/linuxbridge-plugin.filters
>+%{_sysconfdir}/sysconfig/modules/openstack-quantum-linuxbridge.modules
> %dir %{_sysconfdir}/quantum/plugins/linuxbridge
> %config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/plugins/linuxbridge/*.ini
> 
>@@ -594,6 +599,10 @@ fi
> 
> 
> %changelog
>+* Thu Jan 31 2013 Terry Wilson <twison@redhat.com> - 2012.2.1-7
>+- Ensure sysctl conf net.bridge.bridge-nf-call* set by loading bridge module
>+  (bug #877704)
>+
> * Tue Jan 29 2013 Robert Kukura <rkukura@redhat.com> - 2012.2.1-6
> - Add /usr/share/quantum/quantum-dist.conf and cleanup config files (bug 887822)
> - Add /usr/bin/quantum-ovs-cleanup (bug 889786)

Flags:

apevec: review+

Actions: View | Diff

Attachments on bug 877704: 691296