starlingx/upstream
Code Issues Proposed changes

'up' interfaces added via ovs auto_bridge_add

Browse Source 
We should up the interfaces added to ovs bridges, otherwise packets can
not go through the nic interfaces.

Story: 2004649
Task: 29999

Change-Id: Ib1b8577edc7f0d15e1f20479da7740eba127935b
Signed-off-by: chengli3 <cheng1.li@intel.com>
This commit is contained in:
chengli3 2019-03-13 14:20:53 +08:00
parent bdd7559855
commit 32dcec8584
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/openstack-helm/centos/build_srpm.data
View File

@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
TIS_PATCH_VER=13
TIS_PATCH_VER=14

2
openstack/openstack-helm/centos/openstack-helm.spec
View File

@ -31,6 +31,7 @@ Patch10: 0009-Stein-add-log_config_append-to-neutron-etc.patch
Patch11: 0010-Stein-Nova-console-address-config-optionality.patch
Patch12: 0011-Support-per-host-overrides-of-auto_bridge_add.patch
Patch13: 0012-Nova-chart-Add-ephemeral-pool.patch
Patch14: 0013-neutron-up-interfaces-added-via-ovs-auto_bridge_add.patch
BuildRequires: helm
BuildRequires: openstack-helm-infra
@ -54,6 +55,7 @@ Openstack Helm charts
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%build
# initialize helm and build the toolkit

32
openstack/openstack-helm/files/0013-neutron-up-interfaces-added-via-ovs-auto_bridge_add.patch Normal file
View File

@ -0,0 +1,32 @@
From dcd7ebf37b0333191c9be07cd7e8f6a5fdadd567 Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Thu, 7 Mar 2019 21:45:32 +0000
Subject: [PATCH] [neutron] 'up' interfaces added via ovs auto_bridge_add
Previously, when adding interfaces to an ovs bridge we would set the
link state to up. Some environments assume this is the case so
restore that behavior.
This fixes the problem where external (public) IPs for routers and VMs
no longer respond.
Change-Id: I59e21bd5cde7e239320125e9a7e0a33adae578a8
---
neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl | 1 +
1 file changed, 1 insertion(+)
diff --git a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
index 84f5e4b..4dfb0ff 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
@@ -45,6 +45,7 @@ do
if [ -n "$iface" ] && [ "$iface" != "null" ]
then
ovs-vsctl --no-wait --may-exist add-port $bridge $iface
+ ip link set dev $iface up
fi
done
--
2.7.4