From cbcdc7d9a0d6f15f67d72562f658f28770b2ca1f Mon Sep 17 00:00:00 2001
From: Alexander Block <ablock84@gmail.com>
Date: Wed, 14 Dec 2016 15:08:13 +0100
Subject: [PATCH] Set net.ipv4.ip_forward=1 on all systems, not only on GCE

---
 roles/kubernetes/preinstall/tasks/main.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index 3c1e3692b..b94867e51 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -81,7 +81,7 @@
   when: cloud_provider is defined and cloud_provider == 'azure'
   tags: [cloud-provider, azure, facts]
 
-- name: Fix ipv4 forward rule in GCE security policy
+- name: Enable ip forwarding
   lineinfile:
     dest: /etc/sysctl.d/99-sysctl.conf
     regexp: '^net.ipv4.ip_forward='
@@ -90,8 +90,7 @@
     create: yes
     backup: yes
     validate: 'sysctl -f %s'
-  when: cloud_provider is defined and cloud_provider == 'gce'
-  tags: [cloud-provider, gce, bootstrap-os]
+  tags: bootstrap-os
 
 - name: Create cni directories
   file: