From 911a437c1bcd009fc9bdd819f6d7e21fee49fec2 Mon Sep 17 00:00:00 2001
From: Joe Beda <joe.github@bedafamily.com>
Date: Tue, 16 Dec 2014 14:26:36 -0800
Subject: [PATCH] Make the test for the 'docker_opts' grain more robust.

Fixes #2982
---
 cluster/saltbase/salt/docker/docker-defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
index 46cbd9e0587..e56f3e89f69 100644
--- 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"