External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-10-31 14:36:20 -02:30
Code Issues Packages Projects Releases Wiki Activity

Docker Options Refactor

Browse Source
This commit is contained in:
Chad Swenson
2016-12-02 15:07:51 -06:00
parent 7328e0e1ac
commit 8b5b27bb51
17 changed files with 131 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/network_plugin/flannel/templates/docker
-6
View File
@@ -1,6 +0,0 @@
# Deployed by Ansible
{% if (ansible_service_mgr in ["sysvinit","upstart"] and ansible_os_family == "Debian") or (ansible_os_family == "CoreOS") %}
DOCKER_OPTS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}"
{% else %}
OPTIONS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}"
{% endif %}
roles/network_plugin/flannel/templates/docker-systemd
-2
View File
@@ -1,2 +0,0 @@
[Service]
Environment="DOCKER_OPTS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}"
roles/network_plugin/flannel/templates/flannel-options.conf.j2
+2
View File
@@ -0,0 +1,2 @@
[Service]
Environment="DOCKER_NETWORK_OPTIONS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"