Fix the container bridge so that it can create cbr0

Fix the kubelet so that it tries to sync status, even if Docker is down
This commit is contained in:
Brendan Burns
2015-06-19 22:49:18 -07:00
committed by Dawn Chen
parent a29ade2f33
commit 192ffdfb25
6 changed files with 98 additions and 41 deletions

View File

@@ -3,9 +3,5 @@ DOCKER_OPTS=""
DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
{% endif %}
{% 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_OPTS="${DOCKER_OPTS} --bridge=cbr0 --iptables=false --ip-masq=false"
DOCKER_NOFILE=1000000