Change GCE sysctls placement and docs

Override GCE sysctl in /etc/sysctl.d/99-sysctl.conf instead of
the /etc/sysctl.d/11-gce-network-security.conf. It is recreated
by GCE, f.e. if gcloud CLI invokes some security related changes,
thus losing customizations we want to be persistent.

Update cloud providers firewall requirements in calico docs.

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya
2016-12-07 12:45:15 +01:00
parent 1772d122b2
commit f0f2b81276
2 changed files with 6 additions and 1 deletions

View File

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