Pass noDNS and isPluginV2 flags to plugin

- "noDNS" controls whether upon ContainerStarted event a container
  should be registered within the Weave DNS.
- "isPluginV2" will be used to determine a path to host's /proc.

prog/plugin-v2/launch.sh

@@ -16,6 +16,8 @@ echo "Starting launch.sh"
 # Check if the IP range overlaps anything existing on the host
 /usr/bin/weaveutil netcheck $IPALLOC_RANGE weave
 
+# TODO(mp) add wait for swarm
+
 SWARM_MANAGER_PEERS=$(/usr/bin/weaveutil swarm-manager-peers)
 ! /usr/bin/weaveutil is-swarm-manager || IS_SWARM_MANAGER=1
 # Prevent from restoring from a persisted peers list
@@ -39,10 +41,9 @@ if [ "$(/home/weave/weave --local bridge-type)" = "bridge" ]; then
 fi
 
 if [ -z "$IPALLOC_INIT" ]; then
-    if [ $IS_SWARM_MANAGER == "1" ]; then
+    IPALLOC_INIT="observer"
+    if [ "$IS_SWARM_MANAGER" == "1" ]; then
         IPALLOC_INIT="consensus=$(echo $SWARM_MANAGER_PEERS | wc -l)"
-    else
-        IPALLOC_INIT="observer"
     fi
 fi
 
@@ -54,6 +55,6 @@ exec /home/weave/weaver $EXTRA_ARGS --port=6783 $BRIDGE_OPTIONS \
     --nickname "$(hostname)" \
     --log-level=debug \
     --db-prefix="$WEAVE_DIR/weave" \
-    --plugin \
+    --plugin-v2 \
     --plugin-mesh-socket='' \
     $(echo $SWARM_MANAGER_PEERS | tr '\n' ' ')

prog/weaver/main.go

@@ -154,6 +154,7 @@ func main() {
 		pluginSocket       string
 		pluginMeshSocket   string
 		enablePlugin       bool
+		enablePluginV2     bool
 
 		defaultDockerHost = "unix:///var/run/docker.sock"
 	)
@@ -199,7 +200,8 @@ func main() {
 	mflag.StringVar(&token, []string{"-token"}, "", "token for peer discovery")
 	mflag.StringVar(&advertiseAddress, []string{"-advertise-address"}, "", "address to advertise for peer discovery")
 
-	mflag.BoolVar(&enablePlugin, []string{"-plugin"}, false, "enable Docker plugin")
+	mflag.BoolVar(&enablePlugin, []string{"-plugin"}, false, "enable Docker plugin (v1)")
+	mflag.BoolVar(&enablePluginV2, []string{"-plugin-v2"}, false, "enable Docker plugin (v2)")
 	mflag.StringVar(&pluginSocket, []string{"-plugin-socket"}, "/run/docker/plugins/weave.sock", "plugin socket on which to listen")
 	mflag.StringVar(&pluginMeshSocket, []string{"-plugin-mesh-socket"}, "/run/docker/plugins/weavemesh.sock", "plugin socket on which to listen in mesh mode")
 
@@ -404,8 +406,8 @@ func main() {
 		go listenAndServeHTTP(statusAddr, statusMux)
 	}
 
-	if enablePlugin {
-		go plugin.Start(httpAddr, dockerCli, pluginSocket, pluginMeshSocket)
+	if enablePlugin || enablePluginV2 {
+		go plugin.Start(httpAddr, dockerCli, pluginSocket, pluginMeshSocket, noDNS, enablePluginV2)
 	}
 
 	signals.SignalHandlerLoop(common.Log, router)