@@ -93,11 +93,8 @@ function _neutron_ovs_base_configure_l3_agent {

         sudo ip link set $Q_PUBLIC_VETH_EX up

         sudo ip addr flush dev $Q_PUBLIC_VETH_EX

     else

-        # --no-wait causes a race condition if $PUBLIC_BRIDGE is not up when ip addr flush is called

         sudo ovs-vsctl -- --may-exist add-br $PUBLIC_BRIDGE

         sudo ovs-vsctl br-set-external-id $PUBLIC_BRIDGE bridge-id $PUBLIC_BRIDGE

-        # ensure no IP is configured on the public bridge

-        sudo ip addr flush dev $PUBLIC_BRIDGE

     fi

 }