diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults index a8ec4256d5a..43e8fb9eafe 100644 --- 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 diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index 9728ed57293..06d37e26f27 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -48,11 +48,6 @@ net.ipv4.ip_forward: sysctl.present: - value: 1 -cbr0: - container_bridge.ensure: - - cidr: {{ grains['cbr-cidr'] }} - - mtu: 1460 - {{ environment_file }}: file.managed: - source: salt://docker/docker-defaults @@ -124,7 +119,6 @@ docker: - enable: True - watch: - file: {{ environment_file }} - - container_bridge: cbr0 {% if override_docker_ver != '' %} - require: - pkg: lxc-docker-{{ override_docker_ver }}