Merge pull request #19683 from calavera/network_config_file

Allow network configuration via daemon config file. Upstream-commit: 5b0183e91c173c06bcbb5d53da03f13519c14c87 Component: engine
2016-01-25 18:59:20 -08:00
parent 360e6f6c70 3ec10b17fa
commit 531573357d
9 changed files with 116 additions and 60 deletions
@@ -859,7 +859,20 @@ This is a full example of the allowed configuration options in the file:
 	"userns-remap": "",
 	"group": "",
 	"cgroup-parent": "",
-	"default-ulimits": {}
+	"default-ulimits": {},
+       "ipv6": false,
+       "iptables": false,
+       "ip-forward": false,
+       "ip-mask": false,
+       "userland-proxy": false,
+       "ip": "0.0.0.0",
+       "bridge": "",
+       "bip": "",
+       "fixed-cidr": "",
+       "fixed-cidr-v6": "",
+       "default-gateway": "",
+       "default-gateway-v6": "",
+       "icc": false
 }
 ```