Merge pull request kubernetes#23701 from dchen1107/automated-cherry-p…

…ick-of-#23593-upstream-release-1.2 Remove unnecessary override of /etc/init.d/docker on containervm image.
shyamjvs · Mar 31, 2016 · 65ddfdb · 65ddfdb
2 parents 4e051e8 + bc96ff6
commit 65ddfdb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 158 deletions.
diff --git a/cluster/saltbase/salt/docker/docker-init b/cluster/saltbase/salt/docker/docker-init
diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
@@ -162,15 +162,6 @@ docker:
   file.replace:
     - pattern: '^net.ipv4.ip_forward=0'
     - repl: '# net.ipv4.ip_forward=0'
-
-/etc/init.d/docker:
-  file.managed:
-    - source: salt://docker/docker-init
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 755
-    - makedirs: true
 {% endif %}
 
 # Work around Salt #18089: https://github.com/saltstack/salt/issues/18089