diff --git a/prog/weaveutil/bridge.go b/prog/weaveutil/bridge.go index 9c38c815..625e279f 100644 --- a/prog/weaveutil/bridge.go +++ b/prog/weaveutil/bridge.go @@ -45,10 +45,3 @@ func createBridge(args []string) error { fmt.Println(bridgeType.String()) return err } - -func enforceAddrAssign(args []string) error { - if len(args) != 1 { - cmdUsage("enforce-bridge-addr-assign-type", "") - } - return weavenet.EnforceAddrAssignType(args[0]) -} diff --git a/prog/weaveutil/main.go b/prog/weaveutil/main.go index b0f7a33e..46ffa719 100644 --- a/prog/weaveutil/main.go +++ b/prog/weaveutil/main.go @@ -19,7 +19,6 @@ func init() { "docker-tls-args": dockerTLSArgs, "create-bridge": createBridge, "detect-bridge-type": detectBridgeType, - "enforce-addr-assign": enforceAddrAssign, "create-datapath": createDatapath, "delete-datapath": deleteDatapath, "add-datapath-interface": addDatapathInterface, diff --git a/weave b/weave index 93d018b0..f5e4e6fb 100755 --- a/weave +++ b/weave @@ -388,10 +388,6 @@ EOF fi } -enforce_docker_bridge_addr_assign_type() { - util_op enforce-addr-assign "$DOCKER_BRIDGE" || true -} - # Detect the current bridge/datapath state. When invoked, the values of # $BRIDGE and $DATAPATH are expected to be distinct. $BRIDGE_TYPE and # $DATAPATH are set correctly on success; failure indicates that the