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

Fixes kubernetes#2982
duda · Dec 16, 2014 · 911a437 · 911a437
1 parent 56ee668
commit 911a437
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
@@ -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"