From 8591b1c0c29ebd9579858cb9a297fb5d42549d11 Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Thu, 15 Mar 2018 18:48:55 +0000
Subject: [PATCH] neutron: allow creation of ovs bridges with no ports

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

Change-Id: I46881fe3ee48a56a796abe8cf2036eba9e4064e1
---
 neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
index 97da5c8a30..23158aabde 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
@@ -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 -}}"