origin-sdn.patch

--- origin-git-7334.2c6ff4b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/pkg/ovssubnet/controller/multitenant/bin/openshift-ovs-multitenant 2015-12-03 21:21:31.000000000 +0100
+++ origin-git-7334.2c6ff4b-table6patched/Godeps/_workspace/src/github.com/openshift/openshift-sdn/pkg/ovssubnet/controller/multitenant/bin/openshift-ovs-multitenant   2015-12-23 10:24:49.970296462 +0100
@@ -58,7 +58,8 @@
     if [ "${tenant_id}" == "0" ]; then
       ovs-ofctl -O OpenFlow13 add-flow br0 "table=6,priority=150,ip,nw_dst=${ipaddr},actions=output:${ovs_port}"
     else
-      ovs-ofctl -O OpenFlow13 add-flow br0 "table=6,priority=100,ip,nw_dst=${ipaddr},reg0=${tenant_id},actions=output:${ovs_port}"
+      ovs-ofctl -O OpenFlow13 add-flow br0 "table=6,priority=200,ip,nw_dst=${ipaddr},reg0=0,actions=output:${ovs_port}"
+      ovs-ofctl -O OpenFlow13 add-flow br0 "table=6,priority=200,ip,nw_dst=${ipaddr},reg0=${tenant_id},actions=output:${ovs_port}"
     fi
 }
 --- origin-git-7334.2c6ff4b/Godeps/_workspace/src/github.com/openshift/openshift-sdn/pkg/ovssubnet/controller/multitenant/bin/openshift-sdn-multitenant-setup.sh        2015-12-03 21:21:31.000000000 +0100
+++ origin-git-7334.2c6ff4b-table6patched/Godeps/_workspace/src/github.com/openshift/openshift-sdn/pkg/ovssubnet/controller/multitenant/bin/openshift-sdn-multitenant-setup.sh  2015-12-23 10:25:01.589153530 +0100
@@ -155,7 +155,7 @@
     ovs-ofctl -O OpenFlow13 add-flow br0 "table=5, priority=0, ip, actions=output:2"
 
     # Table 6; to local container; mostly filled in by openshift-ovs-multitenant
-    ovs-ofctl -O OpenFlow13 add-flow br0 "table=6, priority=200, ip, reg0=0, actions=goto_table:8"
+    ovs-ofctl -O OpenFlow13 add-flow br0 "table=6, priority=100, ip, reg0=0, actions=goto_table:8"
 
     # Table 7; to remote container; filled in by multitenant.go