Merge pull request #2977 from weaveworks/issues/2975-chain-race

Don't clear WEAVE-NPC chain in weaver
This commit is contained in:
Marc Carré authored and GitHub committed 2017-05-18 11:22:10 +01:00
commit 1e60cff2ef
1 file changed
+2 -3
+2 -3
View File
@@ -436,9 +436,8 @@ func configureIPTables(config *BridgeConfig) error {
if config.NPC {
// Steer traffic via the NPC
if err = ipt.ClearChain("filter", "WEAVE-NPC"); err != nil {
return errors.Wrap(err, "clearing WEAVE-NPC chain")
}
_ = ipt.NewChain("filter", "WEAVE-NPC") // ignore error because it might already exist
// If WEAVE-NPC chain doesn't exist then next line will fail
if err = ipt.AppendUnique("filter", "FORWARD", "-o", config.WeaveBridgeName, "-j", "WEAVE-NPC"); err != nil {
return err
}