Merge pull request #760 from genti-t/issue-748-flannel-options

Fix Flannel network on CoreOS
2016-12-22 19:02:31 +03:00 · 2016-12-22 19:02:31 +03:00 · a4bce333a3
commit a4bce333a3
parent c53a6eca86 7c2785e083
1 changed files with 4 additions and 0 deletions
--- a/roles/network_plugin/flannel/templates/flannel-options.conf.j2
+++ b/roles/network_plugin/flannel/templates/flannel-options.conf.j2
@ -1,2 +1,6 @@
 [Service]
+{% if ansible_os_family == "CoreOS" %}
+Environment="DOCKER_OPT_BIP=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
+{% else %}
 Environment="DOCKER_NETWORK_OPTIONS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
+{% endif %}