github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10401 from justinsb/workaround_salt_18089

Browse Source 
Work around Salt 18089
This commit is contained in:
Vish Kannan 2015-07-23 16:52:21 -07:00
commit 919fded0f8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/docker/init.sls
View File

@ -43,6 +43,10 @@ docker:
- repl: '# net.ipv4.ip_forward=0' - repl: '# net.ipv4.ip_forward=0'
{% endif %} {% endif %}
# Work around Salt #18089: https://github.com/saltstack/salt/issues/18089
/etc/sysctl.d/99-salt.conf:
file.touch
# TODO: This should really be based on network strategy instead of os_family # TODO: This should really be based on network strategy instead of os_family
net.ipv4.ip_forward: net.ipv4.ip_forward:
sysctl.present: sysctl.present: