From ea74bd13b8290efc304df2aea32d166eb0308bed Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 26 Jun 2015 10:56:36 -0400
Subject: [PATCH] Work around Salt 18089

Directly create /etc/sysctl.d/99-salt.conf
---
 cluster/saltbase/salt/docker/init.sls | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
index 06d37e26f27..104ae36dc0f 100644
--- a/cluster/saltbase/salt/docker/init.sls
+++ b/cluster/saltbase/salt/docker/init.sls
@@ -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: