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

Fix Flannel network on CoreOS
This commit is contained in:
Matthew Mosesohn 2016-12-22 19:02:31 +03:00 committed by GitHub
commit a4bce333a3

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 %}