From 0007257bce01dd7637fd673dcf3aa656c53f64b3 Mon Sep 17 00:00:00 2001
From: Jeff Lowdermlk <tiro.jeff.ml@gmail.com>
Date: Mon, 8 Dec 2014 16:42:41 -0800
Subject: [PATCH] Fix conditional on grains.docker_opts in docker-defaults

---
 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 ed75833e8ad..46cbd9e0587 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 is defined %}
+{% if grains.docker_opts %}
 DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
 {% endif %}
 DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false"