From d6a790ec4629ad16f378d07c49641e2878906f2b Mon Sep 17 00:00:00 2001 From: Smaine Kahlouch Date: Mon, 16 Nov 2015 22:15:43 +0100 Subject: [PATCH] default docker template condition --- roles/docker/templates/default-docker.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/docker/templates/default-docker.j2 b/roles/docker/templates/default-docker.j2 index 66e3cd2ee..2a332353e 100644 --- a/roles/docker/templates/default-docker.j2 +++ b/roles/docker/templates/default-docker.j2 @@ -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/"