kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #692 from bogdando/gce_fixes 

Change GCE sysctls placement and docs
pull/695/head
Bogdan Dobrelya 2016-12-07 16:17:30 +01:00 committed by GitHub
parent 45ed6de315 f0f2b81276
commit 8eb26c21be
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/calico.md
View File

@ -71,3 +71,8 @@ you'll need to edit the inventory and add a and a hostvar `local_as` by node.
``` ```
node1 ansible_ssh_host=95.54.0.12 local_as=xxxxxx node1 ansible_ssh_host=95.54.0.12 local_as=xxxxxx
``` ```
Cloud providers configuration
=============================
Please refer to the official documentation, for example [GCE configuration](http://docs.projectcalico.org/v1.5/getting-started/docker/installation/gce) requires a security rule for calico ip-ip tunnels. Note, calico is always configured with ``ipip: true`` if the cloud provider was defined.

2
roles/kubernetes/preinstall/tasks/main.yml
View File

@ -71,7 +71,7 @@
- name: Fix ipv4 forward rule in GCE security policy - name: Fix ipv4 forward rule in GCE security policy
lineinfile: lineinfile:
dest: /etc/sysctl.d/11-gce-network-security.conf dest: /etc/sysctl.d/99-sysctl.conf
regexp: '^net.ipv4.ip_forward=' regexp: '^net.ipv4.ip_forward='
line: 'net.ipv4.ip_forward=1' line: 'net.ipv4.ip_forward=1'
state: present state: present