diff --git a/drivers_experimental_linux.go b/drivers_experimental_linux.go deleted file mode 100644 index 4f540d4a87..0000000000 --- a/drivers_experimental_linux.go +++ /dev/null @@ -1,9 +0,0 @@ -package libnetwork - -import "github.com/docker/libnetwork/drivers/ipvlan" - -func additionalDrivers() []initializer { - return []initializer{ - {ipvlan.Init, "ipvlan"}, - } -} diff --git a/drivers_linux.go b/drivers_linux.go index c53d516fa6..452ffca052 100644 --- a/drivers_linux.go +++ b/drivers_linux.go @@ -3,6 +3,7 @@ package libnetwork import ( "github.com/docker/libnetwork/drivers/bridge" "github.com/docker/libnetwork/drivers/host" + "github.com/docker/libnetwork/drivers/ipvlan" "github.com/docker/libnetwork/drivers/macvlan" "github.com/docker/libnetwork/drivers/null" "github.com/docker/libnetwork/drivers/overlay" @@ -13,14 +14,11 @@ func getInitializers(experimental bool) []initializer { in := []initializer{ {bridge.Init, "bridge"}, {host.Init, "host"}, + {ipvlan.Init, "ipvlan"}, {macvlan.Init, "macvlan"}, {null.Init, "null"}, - {remote.Init, "remote"}, {overlay.Init, "overlay"}, - } - - if experimental { - in = append(in, additionalDrivers()...) + {remote.Init, "remote"}, } return in }