Disable creation of cbr0, the kubelet does it now.

Conditionalize the docker bridge.
2015-06-19 22:46:50 -07:00
parent c5e504a0c8
commit a29ade2f33
2 changed files with 6 additions and 7 deletions
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ b/cluster/saltbase/salt/docker/docker-defaults
@@ -2,5 +2,10 @@ DOCKER_OPTS=""
 {% if grains.docker_opts is defined and grains.docker_opts %}
 DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
 {% endif %}
-DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false"
+
+{% set docker_bridge = "" %}
+{% if grains['roles'][0] == 'kubernetes-pool' %}
+  {% set docker_bridge = "--bridge cbr0" %}
+{% endif %} 
+DOCKER_OPTS="${DOCKER_OPTS} {{docker_bridge}} --iptables=false --ip-masq=false"
 DOCKER_NOFILE=1000000