@@ -507,7 +507,7 @@ function create_neutron_initial_network {

         if [[ "$PUBLIC_INTERFACE" == '' || "$OVS_PHYSICAL_BRIDGE" == '' ]]; then

             die $LINENO "Neutron settings for baremetal not set.. exiting"

         fi

-        sudo ovs-vsctl add-port $OVS_PHYSICAL_BRIDGE $PUBLIC_INTERFACE

+        sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_PHYSICAL_BRIDGE $PUBLIC_INTERFACE

         for IP in $(ip addr show dev $PUBLIC_INTERFACE | grep ' inet ' | awk '{print $2}'); do

             sudo ip addr del $IP dev $PUBLIC_INTERFACE

             sudo ip addr add $IP dev $OVS_PHYSICAL_BRIDGE

@@ -655,7 +655,7 @@ function start_neutron_agents {

     run_process q-dhcp "python $AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file=$Q_DHCP_CONF_FILE"

     if is_provider_network; then

-        sudo ovs-vsctl add-port $OVS_PHYSICAL_BRIDGE $PUBLIC_INTERFACE

+        sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_PHYSICAL_BRIDGE $PUBLIC_INTERFACE

         sudo ip link set $OVS_PHYSICAL_BRIDGE up

         sudo ip link set br-int up

         sudo ip link set $PUBLIC_INTERFACE up