commit 94ba325302e97516abb7a9617854873e76bab68c
author Jenkins <jenkins@review.openstack.org> Tue Aug 09 04:14:44 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Aug 09 04:14:44 2016 +0000
tree b365566b77c580a1cd6fdf88a2be34b7f49d6481
parent 6a008fa74bce0497b7902dd95300599a3026e2dd
parent 75a6454097071523a8617fcbea0f650d42c03341

Merge "neutron: Wait until ovs-vswitchd creates the bridge"

lib/neutron_plugins/ovs_base

diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index 9e1421f..f6d10ea 100644
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -19,7 +19,7 @@
 
 function _neutron_ovs_base_add_bridge {
     local bridge=$1
-    local addbr_cmd="sudo ovs-vsctl --no-wait -- --may-exist add-br $bridge"
+    local addbr_cmd="sudo ovs-vsctl -- --may-exist add-br $bridge"
 
     if [ "$OVS_DATAPATH_TYPE" != "system" ] ; then
         addbr_cmd="$addbr_cmd -- set Bridge $bridge datapath_type=${OVS_DATAPATH_TYPE}"