External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-06 11:11:15 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix docker

Browse Source
This commit is contained in:
ant31
2015-11-20 14:04:13 +01:00
parent f368faf66b
commit 323155b0e1
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,9 +4,9 @@
#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 %}
{% if kube_network_plugin is defined and kube_network_plugin == "calico" %}
DOCKER_OPTS="--bridge=cbr0 --iptables=false --ip-masq=false"
{% endif %}
# If you need Docker to use an HTTP proxy, it can also be specified here.
#export http_proxy="http://127.0.0.1:3128/"