From ddaa716de10cd02913e0f3dff4d2ed7e91fa9417 Mon Sep 17 00:00:00 2001
From: Justin SB <justin@fathomdb.com>
Date: Tue, 4 Nov 2014 14:12:59 -0800
Subject: [PATCH] Allow specification of docker daemon args

---
 cluster/saltbase/salt/docker/docker-defaults | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
index 1317593c272..115a0bb2475 100644
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ b/cluster/saltbase/salt/docker/docker-defaults
@@ -1 +1,6 @@
-DOCKER_OPTS="--bridge cbr0 --iptables=false --ip-masq=false -r=false"
+{% if grains.docker_opts is defined %}
+  {% set docker_opts = grains.docker_opts %}
+{% else %}
+  {% set docker_opts = "" %}
+{% endif %}
+DOCKER_OPTS="{{docker_opts}} --bridge cbr0 --iptables=false --ip-masq=false -r=false"