Merge "[Open vSwitch] Remove auto_bridge_add support"

openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl

@@ -36,18 +36,6 @@ function start () {
 
   ovs-vsctl --no-wait show
 
-  # handle any bridge mappings
-  {{- range $br, $phys := .Values.network.auto_bridge_add }}
-  if [ -n "{{- $br -}}" ] ; then
-      # create {{ $br }}{{ if $phys }} and add port {{ $phys }}{{ end }}
-      ovs-vsctl --no-wait --may-exist add-br "{{ $br }}"
-      if [ -n "{{- $phys -}}" ] ; then
-          ovs-vsctl --no-wait --may-exist add-port "{{ $br }}" "{{ $phys }}"
-          ip link set dev "{{ $phys }}" up
-      fi
-  fi
-  {{- end }}
-
   exec /usr/sbin/ovs-vswitchd unix:${OVS_SOCKET} \
           -vconsole:emer \
           -vconsole:err \

openvswitch/values.yaml

@@ -37,19 +37,6 @@ labels:
     node_selector_key: openvswitch
     node_selector_value: enabled
 
-network:
-  # auto_bridge_add is a table of "bridge: interface" pairs, by
-  # default empty
-  # To automatically add a physical interfaces to a specific bridges,
-  # for example eth3 to bridge br-physnet1, if0 to br0 and iface_two
-  # to br1 do something like:
-  #
-  # auto_bridge_add:
-  #   br-physnet1: eth3
-  #   br0: if0
-  #   br1: iface_two
-  auto_bridge_add: {}
-
 pod:
   lifecycle:
     upgrades: