1. devstack
  2. Commit 56b7efbf93d8afbdd093934f183a7096ce798552
Browse code

Gracefully add provider network port

Patch 5ec6f8f1 introduced the provider network support in DevStack. However, this patch
does not include a port clean up routine during ./unstack that openvswitch complains
that the PUBLIC_INTERFACE already exists and exits when you run DevStack multiple times.
Adding --may-exist to ovs add-port command solves this problem.

Change-Id: I89dc560ffb35fccf6ceed2557047adca37054ce7

Zhongyue Luo authored on 2014/12/16 12:36:49
Showing 1 changed files
lib/neutron
History View file @ 56b7efb
... ... 
@@ -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