Merge pull request #2502 from weaveworks/issues/2469-supply-subnet

Pass in default subnet when creating 'weave' plugin network.

Fixes #2469.
This commit is contained in:
Matthias Radestock authored and GitHub committed 2016-09-08 12:49:01 +01:00
commit c720ebec02
2 files changed
+10 -5

No files matched your search

+8 -4
View File
@@ -10,11 +10,12 @@ import (
) )
func createPluginNetwork(args []string) error { func createPluginNetwork(args []string) error {
if len(args) != 2 { if len(args) != 3 {
cmdUsage("create-plugin-network", "<network-name> <driver-name>") cmdUsage("create-plugin-network", "<network-name> <driver-name> <default-subnet>")
} }
networkName := args[0] networkName := args[0]
driverName := args[1] driverName := args[1]
subnet := args[2]
d, err := newDockerClient() d, err := newDockerClient()
if err != nil { if err != nil {
return err return err
@@ -24,8 +25,11 @@ func createPluginNetwork(args []string) error {
Name: networkName, Name: networkName,
CheckDuplicate: true, CheckDuplicate: true,
Driver: driverName, Driver: driverName,
IPAM: docker.IPAMOptions{Driver: driverName}, IPAM: docker.IPAMOptions{
Options: map[string]interface{}{plugin.MulticastOption: "true"}, Driver: driverName,
Config: []docker.IPAMConfig{{Subnet: subnet}},
},
Options: map[string]interface{}{plugin.MulticastOption: "true"},
}) })
if err != docker.ErrNetworkAlreadyExists && err != nil { if err != docker.ErrNetworkAlreadyExists && err != nil {
// Despite appearances to the contrary, CreateNetwork does // Despite appearances to the contrary, CreateNetwork does
+2 -1
View File
@@ -1782,7 +1782,8 @@ launch_plugin_if_not_running() {
return 1 return 1
fi fi
wait_for_status $PLUGIN_CONTAINER_NAME http_call_unix $PLUGIN_CONTAINER_NAME status.sock wait_for_status $PLUGIN_CONTAINER_NAME http_call_unix $PLUGIN_CONTAINER_NAME status.sock
util_op create-plugin-network weave weavemesh WEAVE_IPAM_SUBNET=$(call_weave GET /ipinfo/defaultsubnet)
util_op create-plugin-network weave weavemesh $WEAVE_IPAM_SUBNET
} }
plugin_disabled() { plugin_disabled() {