From d6a30ff6a45f2ee1c5703e53484d2367f06d3cf8 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Wed, 15 Nov 2017 17:20:15 +0000
Subject: [PATCH] Revert "openvswitch: Move IP address from physical device to
 bridge"

This prevents the pod restarting correctly on a node reboot - we need
to find another way to do this.

This reverts commit 27aadd67e05632afb86e97a39f775c0a1cc5f81f.

Change-Id: Id7d4ae94ade99d38729b30d6d2ba7d5385d50a4b
---
 .../templates/bin/_openvswitch-vswitchd.sh.tpl       | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl b/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
index 5d4e15c42e..61364aa1a6 100644
--- a/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
+++ b/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
@@ -47,12 +47,6 @@ if [ -n "${external_bridge}" ] ; then
         # add external interface to the bridge
         ovs-vsctl --no-wait --may-exist add-port $external_bridge $external_interface
         ip link set dev $external_interface up
-        ip link set dev $external_bridge up
-        # move ip address from physical interface to the bridge
-        for IP in $(ip addr show dev $external_interface | grep ' inet ' | awk '{print $2}'); do
-            ip addr add $IP dev $external_bridge
-            ip addr del $IP dev $external_interface
-        done
     fi
 fi
 
@@ -64,12 +58,6 @@ if [ -n "{{- $br -}}" ] ; then
     if [ -n "{{- $phys -}}" ] ; then
         ovs-vsctl --no-wait --may-exist add-port "{{ $br }}" "{{ $phys }}"
         ip link set dev "{{ $phys }}" up
-        ip link set dev "{{ $br }}" up
-        # move ip address from physical interface to the bridge
-        for IP in $(ip addr show dev "{{ $phys }}" | grep ' inet ' | awk '{print $2}'); do
-            ip addr add $IP dev "{{ $br }}"
-            ip addr del $IP dev "{{ $phys }}"
-        done
     fi
 fi
 {{- end }}