Merge pull request #10401 from justinsb/workaround_salt_18089

Work around Salt 18089
This commit is contained in:
Vish Kannan 2015-07-23 16:52:21 -07:00
commit 919fded0f8

View File

@ -43,6 +43,10 @@ docker:
- repl: '# net.ipv4.ip_forward=0'
{% 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
net.ipv4.ip_forward:
sysctl.present: