openstack/openstack-helm
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2017-11-17 02:50:36 +00:00 committed by Gerrit Code Review
commit d6f1aead74
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
View File

@ -41,12 +41,6 @@ if [ -n "${external_bridge}" ] ; then
# add external interface to the bridge # add external interface to the bridge
ovs-vsctl --no-wait --may-exist add-port $external_bridge $external_interface ovs-vsctl --no-wait --may-exist add-port $external_bridge $external_interface
ip link set dev $external_interface up 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
fi fi
@ -58,12 +52,6 @@ if [ -n "{{- $br -}}" ] ; then
if [ -n "{{- $phys -}}" ] ; then if [ -n "{{- $phys -}}" ] ; then
ovs-vsctl --no-wait --may-exist add-port "{{ $br }}" "{{ $phys }}" ovs-vsctl --no-wait --may-exist add-port "{{ $br }}" "{{ $phys }}"
ip link set dev "{{ $phys }}" up 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
fi fi
{{- end }} {{- end }}