github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2986 from jbeda/docker-default-fix 

Make the test for the 'docker_opts' grain more robust.
pull/6/head
Jeff Lowdermilk 2014-12-16 15:04:16 -08:00
parent 003ba68e4c 911a437c1b
commit c2fa72d6ba
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="" DOCKER_OPTS=""
{% if grains.docker_opts %} {% if grains.docker_opts is defined and grains.docker_opts %}
DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}" DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
{% endif %} {% endif %}
DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false" DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false"