openstack/openstack-helm
Code Issues Proposed changes

Revert "openvswitch: Move IP address from physical device to bridge"

Browse Source 
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
This commit is contained in:
Pete Birley 2017-11-15 17:20:15 +00:00
parent 27aadd67e0
commit d6a30ff6a4
1 changed files with 0 additions and 12 deletions

12
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 }}