Skip to content

K
k3s
Commit c2fa72d6 authored by Jeff Lowdermilk's avatar Jeff Lowdermilk
Browse files
Options

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

Make the test for the 'docker_opts' grain more robust.
parents 003ba68e 911a437c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/saltbase/salt/docker/docker-defaults
View file @ c2fa72d6
DOCKER_OPTS=""
{% if grains.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 -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