epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix Flannel network on CoreOS
This commit is contained in:
Matthew Mosesohn
2016-12-22 19:02:31 +03:00
committed by GitHub
parent c53a6eca86 7c2785e083
commit a4bce333a3
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/network_plugin/flannel/templates/flannel-options.conf.j2
View File

@@ -1,2 +1,6 @@
[Service] [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 }}" Environment="DOCKER_NETWORK_OPTIONS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
{% endif %}