beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #873 from aboch/dpt

Browse source 
Honor --iptables=false in bridge
This commit is contained in:
Jana Radhakrishnan 2016-01-14 10:16:38 -08:00
commit e2ea1801f9
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnetwork/drivers/bridge/bridge.go
View file

@ -135,7 +135,7 @@ func Init(dc driverapi.DriverCallback, config map[string]interface{}) error {
if err := iptables.FirewalldInit(); err != nil {
logrus.Debugf("Fail to initialize firewalld: %v, using raw iptables instead", err)
}
removeIPChains()
d := newDriver()
if err := d.configure(config); err != nil {
return err
@ -378,6 +378,7 @@ func (d *driver) configure(option map[string]interface{}) error {
}
if config.EnableIPTables {
removeIPChains()
natChain, filterChain, isolationChain, err = setupIPChains(config)
if err != nil {
return err

8
libnetwork/drivers/bridge/bridge_test.go
View file

@ -817,12 +817,6 @@ func TestSetDefaultGw(t *testing.T) {
}
}
type fakeCallBack struct{}
func (cb fakeCallBack) RegisterDriver(name string, driver driverapi.Driver, capability driverapi.Capability) error {
return nil
}
func TestCleanupIptableRules(t *testing.T) {
defer testutils.SetupTestOSContext(t)()
bridgeChain := []iptables.ChainInfo{
@ -838,7 +832,7 @@ func TestCleanupIptableRules(t *testing.T) {
t.Fatalf("iptables chain %s of %s table should have been created", chainInfo.Name, chainInfo.Table)
}
}
Init(fakeCallBack{}, make(map[string]interface{}))
removeIPChains()
for _, chainInfo := range bridgeChain {
if iptables.ExistChain(chainInfo.Name, chainInfo.Table) {
t.Fatalf("iptables chain %s of %s table should have been deleted", chainInfo.Name, chainInfo.Table)