minor fixes so rebase still works

Author: JacobTanenbaum

pkg/sdn/plugin/networkpolicy.go

@@ -77,7 +77,9 @@ func (np *networkPolicyPlugin) Start(node *OsdnNode) error {
 	}
 
 	otx := node.oc.NewTransaction()
-	otx.AddFlow("table=21, priority=200, ip, nw_dst=%s, actions=ct(commit,table=30)", np.node.networkInfo.ClusterNetwork.String())
+	for _,  cidr := range np.node.networkInfo.ClusterNetwork {
+		otx.AddFlow("table=21, priority=200, ip, nw_dst=%s, actions=ct(commit,table=30)", cidr.String())
+	}
 	otx.AddFlow("table=80, priority=200, ip, ct_state=+rpl, actions=output:NXM_NX_REG2[]")
 	if err := otx.EndTransaction(); err != nil {
 		return err

pkg/sdn/plugin/node.go

@@ -247,7 +247,7 @@ func (node *OsdnNode) Start() error {
 	for _, cidr := range node.networkInfo.ClusterNetwork {
 		cidrList = append(cidrList, cidr.String())
 	}
-	nodeIPTables := newNodeIPTables(cidrList, node.iptablesSyncPeriod)
+	nodeIPTables := newNodeIPTables(cidrList, node.iptablesSyncPeriod, !node.useConnTrack)
 
 	if err = nodeIPTables.Setup(); err != nil {
 		return fmt.Errorf("failed to set up iptables: %v", err)