For GCE, allow insecure registries anywhere in 10.0.0.0/8.

2014-11-25 17:47:02 -08:00
parent 00477c3813
commit f8505cd286
5 changed files with 21 additions and 7 deletions
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ b/cluster/saltbase/salt/docker/docker-defaults
@@ -1,6 +1,5 @@
+DOCKER_OPTS=""
 {% if grains.docker_opts is defined %}
-  {% set docker_opts = grains.docker_opts %}
-{% else %}
-  {% set docker_opts = "" %}
+DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
 {% endif %}
-DOCKER_OPTS="{{docker_opts}} --bridge cbr0 --iptables=false --ip-masq=false -r=false"
+DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false"