epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-08 11:07:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify docker role, cbr0 for calico isn't required anymore

Browse Source
This commit is contained in:
Smaine Kahlouch
2015-11-22 13:33:13 +01:00
parent d7b7db34fa
commit d3f35e12a2
3 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/docker/templates/default-docker.j2
View File

@@ -4,9 +4,7 @@
#DOCKER="/usr/local/bin/docker"
# Use DOCKER_OPTS to modify the daemon startup options.
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
DOCKER_OPTS="--bridge=cbr0 --iptables=false --ip-masq=false"
{% endif %}
#DOCKER_OPTS=""
# If you need Docker to use an HTTP proxy, it can also be specified here.
#export http_proxy="http://127.0.0.1:3128/"