Merge pull request #3088 from weaveworks/issues/3054-honour-no-dns-in-proxy

If DNS server is off then disable proxy DNS registration

prog/weaver/main.go

@@ -254,6 +254,9 @@ func main() {
 	var proxy *weaveproxy.Proxy
 	var err error
 	if proxyConfig.Enabled {
+		if noDNS {
+			proxyConfig.WithoutDNS = true
+		}
 		// Start Weave Proxy:
 		proxy, err = weaveproxy.NewProxy(*proxyConfig)
 		if err != nil {