Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary override of /etc/init.d/docker on containervm image. #23593

Merged
merged 1 commit into from
Mar 31, 2016
Merged

Remove unnecessary override of /etc/init.d/docker on containervm image. #23593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
149 changes: 0 additions & 149 deletions cluster/saltbase/salt/docker/docker-init
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions cluster/saltbase/salt/docker/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down