Skip to content

K
k3s
Commit 919fded0 authored by Vish Kannan's avatar Vish Kannan
Browse files
Options

Merge pull request #10401 from justinsb/workaround_salt_18089

Work around Salt 18089
parents 45def3f3 ea74bd13
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cluster/saltbase/salt/docker/init.sls
View file @ 919fded0
...@@ -43,6 +43,10 @@ docker: ...@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment