Commit Graph

5 Commits (a7788aff249f2272f02373cbf24f7b3accd19e94)

Author SHA1 Message Date
David McMahon ef0c9f0c5b Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
Justin Santa Barbara 6bdab05d11 Salt: Don't use Salt to start Docker
Starting docker through Salt has always been problematic.  Kubelet or
the babysitter process should start it.  We've kept it around primarily
so we have a `service: docker` node for the Salt DAG.

Instead, we enable (but do not start) the Docker service in Salt.  This
lets us keep the DAG node, but won't start it.

There's another bug in Salt, where watches will start the service even
on `service.enabled`.  So we remove the watches, and move them to our
existing Salt bug-fix script.
2016-03-04 12:07:10 -05:00
Justin Santa Barbara 4ce0f8ccec Salt: bypass Salt when installing docker package on debian
The Docker 1.9.1 package on Debian is broken, and the service fails to
install when run unattended.  This is treated as an installation failure
and causes everything to fail.

However, the service can be started by Salt once we're not installing
the package, and indeed we restart docker anyway.

So, on Debian, use a helper script to install the docker package.  The
script sets up a policy-rc.d file to prevent the service starting, and
then cleanly removes it afterwards (this would be difficult to do in
Salt, I believe).
2016-03-03 11:14:33 -05:00
Justin Santa Barbara 944fc1ed58 Set standard bash options in services helper script 2015-07-03 01:40:15 -04:00
Justin Santa Barbara bcd92c7522 Salt: support systemd (don't assume Redhat <=> systemd)
Also work around problems with Salt & systemd services, in particular
that Salt doesn't issue a daemon-reload.
2015-07-03 01:40:15 -04:00