mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 14:37:00 +00:00
Merge pull request #2986 from jbeda/docker-default-fix
Make the test for the 'docker_opts' grain more robust.
This commit is contained in:
commit
c2fa72d6ba
@ -1,5 +1,5 @@
|
||||
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"
|
||||
|
Loading…
Reference in New Issue
Block a user