Limit GCE specific mods to GCE

kubernetes · Oct 29, 2014 · 918c8e2 · 918c8e2
1 parent 5b22dd7
commit 918c8e2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
@@ -17,12 +17,16 @@ docker-repo:
     - require:
       - pkg: pkg-core
 
+{% if grains.cloud is defined %}
+{% if grains.cloud == 'gce' %}
 # The default GCE images have ip_forwarding explicitly set to 0.
 # Here we take care of commenting that out.
 /etc/sysctl.d/11-gce-network-security.conf:
   file.replace:
     - pattern: '^net.ipv4.ip_forward=0'
     - repl: '# net.ipv4.ip_forward=0'
+{% endif %}
+{% endif %}
 
 net.ipv4.ip_forward:
   sysctl.present: