scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-24 02:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix the race between configuring cbr0 and restarting static pods"

Browse Source
This commit is contained in:
Piotr Szczesniak
2015-06-24 09:56:49 +02:00
parent 5b4dc4edaa
commit fd0a95dd12
11 changed files with 40 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/docker/docker-defaults
View File

@@ -2,5 +2,5 @@ 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"
DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false"
DOCKER_NOFILE=1000000