Browse code
Merge "neutron: Wait until ovs-vswitchd creates the bridge"
Jenkins authored on 2016/08/09 13:14:44Showing 1 changed files
| ... | ... |
@@ -19,7 +19,7 @@ function is_neutron_ovs_base_plugin {
|
| 19 | 19 |
|
| 20 | 20 |
function _neutron_ovs_base_add_bridge {
|
| 21 | 21 |
local bridge=$1 |
| 22 |
- local addbr_cmd="sudo ovs-vsctl --no-wait -- --may-exist add-br $bridge" |
|
| 22 |
+ local addbr_cmd="sudo ovs-vsctl -- --may-exist add-br $bridge" |
|
| 23 | 23 |
|
| 24 | 24 |
if [ "$OVS_DATAPATH_TYPE" != "system" ] ; then |
| 25 | 25 |
addbr_cmd="$addbr_cmd -- set Bridge $bridge datapath_type=${OVS_DATAPATH_TYPE}"
|