Merge pull request #2147 from justinsb/ipv6

Initial ipv6 / iptables work
2014-11-14 10:34:37 -08:00
parent c25ef89b24 b19170f335
commit c2485a4056
10 changed files with 250 additions and 163 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"