Skip to content

K
k3s
Commit 90f71ea4 authored by Joe Beda's avatar Joe Beda
Browse files
Options

Merge pull request #2805 from jlowdermilk/fix-salt

Fix conditional docker_opts in salt/docker/docker-defaults
parents f18846c9 0007257b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/saltbase/salt/docker/docker-defaults
View file @ 90f71ea4
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"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment