xenserver: Must pass --no-wait to ovs-vsctl before starting ovs-vswitchd.

[openvswitch] / xenserver / etc_xensource_scripts_vif

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index c81358a2c82a9caf9db6123fe3d93b0b24e2e2b4..3a209f9b4ae315d732483d0d6fb8f9f4eb1323d5 100755 (executable)
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -120,7 +120,7 @@ xs550_set_internal_network_uuid()
         local net_uuid=$(xenstore-read "${PRIVATE}/network-uuid" 2>/dev/null)
         if [ -n "${net_uuid}" ] ; then
             logger -t scripts-vif "${bridge} xs-network-uuids ${net_uuid}"
-            echo "-- br-set-external-id \"$bridge\" xs-network-uuids \"${net_uuid}\""
+            echo "-- br-set-external-id $bridge xs-network-uuids ${net_uuid}"
         fi
     else
         # XAPI after 5.5.0 sets the network external ids itself, via ovs-vsctl.
@@ -158,7 +158,7 @@ add_to_bridge()
                local vif_details=$(handle_vswitch_vif_details)
            fi
 
-           $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details $(xs550_set_internal_network_uuid)
+           $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details $(xs550_set_internal_network_uuid $bridge)
            ;;
     esac
            
@@ -172,7 +172,10 @@ remove_from_bridge()
            # Nothing to do
            ;;
        vswitch)
-           $vsctl del-port $bridge $dev
+            # If ovs-brcompatd is running, it might already have deleted the
+            # port.  Use --if-exists to suppress the error that would otherwise
+            # arise in that case.
+           $vsctl -- --if-exists del-port $dev
            ;;
     esac
 }