Merge pull request jpetazzo#15 from PeerXu/master

Add support for openvswitch.

README.md

@@ -178,6 +178,14 @@ be `2`, `6`, `a`, or `e`. You can check [Wikipedia](
 http://en.wikipedia.org/wiki/MAC_address) if you want even more details.
 
 
+## Support Open vSwitch
+
+If you want to attach a container to the Open vSwitch bridge, no problem.
+
+    ovs-vsctl list-br
+    ovsbr0
+    pipework ovsbr0 $(docker run -d mysql /usr/sbin/mysqld_safe) 192.168.1.2/24
+
 ## Cleanup
 
 When a container is terminated (the last process of the net namespace exits),

pipework

@@ -27,7 +27,13 @@ MACADDR=$4
 if [ -d /sys/class/net/$IFNAME ]
 then
     if [ -d /sys/class/net/$IFNAME/bridge ]
-    then IFTYPE=bridge
+    then 
+        IFTYPE=bridge
+        BRTYPE=linux
+    elif $(which ovs-vsctl >/dev/null) && $(ovs-vsctl list-br|grep -q ^$IFNAME$)
+    then 
+        IFTYPE=bridge
+        BRTYPE=openvswitch
     else IFTYPE=phys
     fi
 else
@@ -115,7 +121,14 @@ ln -s /proc/$NSPID/ns/net /var/run/netns/$NSPID
     LOCAL_IFNAME=vethl$NSPID
     GUEST_IFNAME=vethg$NSPID
     ip link add name $LOCAL_IFNAME type veth peer name $GUEST_IFNAME
-    ip link set $LOCAL_IFNAME master $IFNAME
+    case "$BRTYPE" in
+        linux)
+            ip link set $LOCAL_IFNAME master $IFNAME
+            ;;
+        openvswitch)
+            ovs-vsctl add-port $IFNAME $LOCAL_IFNAME
+            ;;
+    esac
     ip link set $LOCAL_IFNAME up
 }