openstack/openstack-helm
Code Issues Proposed changes

neutron: allow creation of ovs bridges with no ports

Browse Source 
it's valid to create a bridge and not add ports; this restores that
ability

Change-Id: I46881fe3ee48a56a796abe8cf2036eba9e4064e1
This commit is contained in:
Chris Wedgwood 2018-03-15 18:48:55 +00:00
parent 0c7b6e01a3
commit 8591b1c0c2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
View File

@ -32,8 +32,10 @@ timeout 3m neutron-sanity-check --config-file /etc/neutron/neutron.conf --config
# handle any bridge mappings
{{- range $bridge, $port := .Values.network.auto_bridge_add }}
ovs-vsctl --no-wait --may-exist add-br {{ $bridge }}
{{ if $port }}
ovs-vsctl --no-wait --may-exist add-port {{ $bridge }} {{ $port }}
ip link set dev {{ $port }} up
{{ end }}
{{- end }}
tunnel_interface="{{- .Values.network.interface.tunnel -}}"