From 32dcec8584a4626e547527991091d7d3759aa484 Mon Sep 17 00:00:00 2001
From: chengli3 <cheng1.li@intel.com>
Date: Wed, 13 Mar 2019 14:20:53 +0800
Subject: [PATCH] 'up' interfaces added via ovs auto_bridge_add

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>
---
 .../openstack-helm/centos/build_srpm.data     |  2 +-
 .../openstack-helm/centos/openstack-helm.spec |  2 ++
 ...rfaces-added-via-ovs-auto_bridge_add.patch | 32 +++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 openstack/openstack-helm/files/0013-neutron-up-interfaces-added-via-ovs-auto_bridge_add.patch

diff --git a/openstack/openstack-helm/centos/build_srpm.data b/openstack/openstack-helm/centos/build_srpm.data
index 34c72c81..f167d8e9 100644
--- a/openstack/openstack-helm/centos/build_srpm.data
+++ b/openstack/openstack-helm/centos/build_srpm.data
@@ -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
diff --git a/openstack/openstack-helm/centos/openstack-helm.spec b/openstack/openstack-helm/centos/openstack-helm.spec
index d1ec407e..3dc3e7dc 100644
--- a/openstack/openstack-helm/centos/openstack-helm.spec
+++ b/openstack/openstack-helm/centos/openstack-helm.spec
@@ -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
diff --git a/openstack/openstack-helm/files/0013-neutron-up-interfaces-added-via-ovs-auto_bridge_add.patch b/openstack/openstack-helm/files/0013-neutron-up-interfaces-added-via-ovs-auto_bridge_add.patch
new file mode 100644
index 00000000..2c9603dc
--- /dev/null
+++ b/openstack/openstack-helm/files/0013-neutron-up-interfaces-added-via-ovs-auto_bridge_add.patch
@@ -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
+