Allow specification of docker daemon args

2014-11-04 14:12:59 -08:00
parent 8e70a664e8
commit ddaa716de1
1 changed files with 6 additions and 1 deletions
--- 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"