From 918c8e2b9658242ed311c5326d12c50d5ec0ced6 Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pnoordhuis@vmware.com>
Date: Wed, 29 Oct 2014 12:39:07 -0700
Subject: [PATCH] Limit GCE specific mods to GCE

---
 cluster/saltbase/salt/docker/init.sls | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
index 942b3d11cd9..ba6da221b2a 100644
--- 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: