From c948056e1d99ee7b25c7e4ef64780ee2621228c2 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 5 Jan 2016 13:42:43 -0500 Subject: [PATCH] Fix a bug with services in multitenant A reorganization of the rules in the danw/vxlan-filtering merge broke node -> remote-pod traffic (and also vnid-0-pod -> remote-pod traffic), which among other things meant that remote services would no longer work when referred to by service IP. --- plugins/osdn/ovs/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/osdn/ovs/controller.go b/plugins/osdn/ovs/controller.go index 1a6526f..7070f15 100644 --- a/plugins/osdn/ovs/controller.go +++ b/plugins/osdn/ovs/controller.go @@ -193,7 +193,7 @@ func (c *FlowController) Setup(localSubnetCIDR, clusterNetworkCIDR, servicesNetw // Table 3; incoming from vxlan otx.AddFlow("table=3, priority=200, ip, nw_dst=%s, actions=output:2", localSubnetGateway) if c.multitenant { - otx.AddFlow("table=3, priority=100, ip, nw_dst=%s, actions=move:NXM_NX_TUN_ID[0..31]->NXM_NX_REG0[], goto_table:7", localSubnetCIDR) + otx.AddFlow("table=3, priority=100, ip, nw_dst=%s, actions=move:NXM_NX_TUN_ID[0..31]->NXM_NX_REG0[], goto_table:6", localSubnetCIDR) } else { otx.AddFlow("table=3, priority=100, ip, nw_dst=%s, actions=goto_table:9", localSubnetCIDR) }