github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2805 from jlowdermilk/fix-salt

Browse Source 
Fix conditional docker_opts in salt/docker/docker-defaults
This commit is contained in:
Joe Beda 2014-12-09 10:16:55 -08:00
commit 90f71ea4d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
DOCKER_OPTS=""
{% if grains.docker_opts is defined %}
{% if grains.docker_opts %}
DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
{% endif %}
DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false"