Browse code

Merge "Gracefully add provider network port"

Jenkins authored on 2015/01/21 00:16:02
Showing 1 changed files
... ...
@@ -699,7 +699,7 @@ function start_neutron_agents {
699 699
     run_process q-dhcp "python $AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file=$Q_DHCP_CONF_FILE"
700 700
 
701 701
     if is_provider_network; then
702
-        sudo ovs-vsctl add-port $OVS_PHYSICAL_BRIDGE $PUBLIC_INTERFACE
702
+        sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_PHYSICAL_BRIDGE $PUBLIC_INTERFACE
703 703
         sudo ip link set $OVS_PHYSICAL_BRIDGE up
704 704
         sudo ip link set br-int up
705 705
         sudo ip link set $PUBLIC_INTERFACE up