Skip to content

K
k3s
Commit 911a437c authored by Joe Beda's avatar Joe Beda
Browse files
Options

Make the test for the 'docker_opts' grain more robust.

Fixes #2982
parent 56ee6683
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/saltbase/salt/docker/docker-defaults
View file @ 911a437c
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"
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