Attachment 1491474 Details for Bug 1473792 – RHOSP7 diff for this CVE

RHOSP7 diff for this CVE

openstack-neutron-RHOSP7.txt (text/plain), 1.72 KB, created by Summer Long on 2018-10-08 00:17:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Summer Long

Created: 2018-10-08 00:17:08 UTC

Size: 1.72 KB

patch

obsolete

>diff --git a/neutron-l2-agent-sysctl.conf b/neutron-l2-agent-sysctl.conf
>new file mode 100644
>index 0000000..d0ce3b4
>--- /dev/null
>+++ b/neutron-l2-agent-sysctl.conf
>@@ -0,0 +1,3 @@
>+net.bridge.bridge-nf-call-arptables = 1
>+net.bridge.bridge-nf-call-ip6tables = 1
>+net.bridge.bridge-nf-call-iptables = 1
>diff --git a/neutron-l2-agent.modules b/neutron-l2-agent.modules
>new file mode 100644
>index 0000000..52f3c45
>--- /dev/null
>+++ b/neutron-l2-agent.modules
>@@ -0,0 +1,4 @@
>+#!/bin/sh
>+exec /sbin/modprobe -b bridge >/dev/null 2>&1
>+exec /sbin/modprobe -b br_netfilter >/dev/null 2>&1
>+exit 0
>diff --git a/openstack-neutron.spec b/openstack-neutron.spec
>index 3fd2801..2728f91 100644
>--- a/openstack-neutron.spec
>+++ b/openstack-neutron.spec
>@@ -5,7 +5,7 @@
> 
> Name:		openstack-%{service}
> Version:	2015.1.4
>-Release:	17%{?dist}
>+Release:	18%{?dist}
> Provides:	openstack-quantum = %{version}-%{release}
> Obsoletes:	openstack-quantum < 2013.2-0.4.b3
> Summary:	OpenStack Networking Service
>@@ -39,6 +39,11 @@ Source27:	NeutronScale.ocf_ra
> Source30:	%{service}-dist.conf
> Source31:	conf.README
> Source33:       neutron-enable-bridge-firewall.sh
>+Source34:       neutron-l2-agent-sysctl.conf
>+# We use the legacy service to load modules because it allows to gracefully
>+# ignore a missing kernel module (f.e. br_netfilter on earlier kernels). It's
>+# essentially because .modules files are shell scripts.
>+Source35:       neutron-l2-agent.modules
> 
> #
> # patches_base=+2
>@@ -678,6 +683,14 @@ install -p -D -m 755 %{SOURCE25} %{buildroot}%{_prefix}/lib/ocf/resource.d/neutr
> install -p -D -m 755 %{SOURCE26} %{buildroot}%{_prefix}/lib/ocf/resource.d/neutron/OVSCleanup
> install -p -D -m 755 %{SOURCE27} %{buildroot}%{_prefix}/lib/ocf/resource.d/neutron/NeutronScale

Actions: View

Attachments on bug 1473792: 1491473 | 1491474